March 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : ws2_32/tests: Fix a couple of failures on Windows.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 66f940a2eccbf00c08d3bc08467bc18d321868f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/66f940a2eccbf00c08d3bc08467bc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 08:42:51 2024 +0100 ws2_32/tests: Fix a couple of failures on Windows. --- dlls/ws2_32/tests/protocol.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8a1efb6b5d0..e1a431a3e32 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1917,8 +1917,8 @@ static void test_GetAddrInfoW(void) SetLastError(0xdeadbeef); result2 = NULL; ret = GetAddrInfoW(idn_domain, NULL, &hint, &result2); - ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); - ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(ret == WSAHOST_NOT_FOUND || ret == WSATRY_AGAIN, "got %d\n", ret); + ok(WSAGetLastError() == ret, "got %d\n", WSAGetLastError()); ok(result2 == NULL, "got %p\n", result2); } @@ -1926,6 +1926,7 @@ static struct completion_routine_test { WSAOVERLAPPED *overlapped; DWORD error; + DWORD error2; ADDRINFOEXW **result; HANDLE event; DWORD called; @@ -1935,7 +1936,7 @@ static void CALLBACK completion_routine(DWORD error, DWORD byte_count, WSAOVERLA { struct completion_routine_test *test = &completion_routine_test; - ok(error == test->error, "got %lu\n", error); + ok(error == test->error || (test->error2 && error == test->error2), "got %lu\n", error); ok(!byte_count, "got %lu\n", byte_count); ok(overlapped == test->overlapped, "got %p\n", overlapped); ok(overlapped->Internal == test->error, "got %Iu\n", overlapped->Internal); @@ -2073,6 +2074,7 @@ static void test_GetAddrInfoExW(void) overlapped.hEvent = NULL; completion_routine_test.overlapped = &overlapped; completion_routine_test.error = ERROR_SUCCESS; + completion_routine_test.error2 = ERROR_SUCCESS; completion_routine_test.result = &result; completion_routine_test.event = event; completion_routine_test.called = 0; @@ -2093,6 +2095,7 @@ static void test_GetAddrInfoExW(void) result = (void *)0xdeadbeef; completion_routine_test.overlapped = &overlapped; completion_routine_test.error = WSAHOST_NOT_FOUND; + completion_routine_test.error2 = WSANO_DATA; completion_routine_test.called = 0; ResetEvent(event); ret = pGetAddrInfoExW(nxdomain, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL);

1 0

Alexandre Julliard : include: Define setjmpex prototype even when it's a builtin.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: fd865a838695157affe5a5d18c63d416b0d0149f URL: https://gitlab.winehq.org/wine/wine/-/commit/fd865a838695157affe5a5d18c63d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 13:42:00 2024 +0100 include: Define setjmpex prototype even when it's a builtin. --- include/msvcrt/setjmp.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 38f9ba682ad..fca5543a04b 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -164,10 +164,11 @@ _ACRTIMP void __cdecl longjmp(jmp_buf,int); _ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # endif # define setjmp(buf) _setjmp((buf)) -#else /* __i386__ */ -# if defined(_setjmpex) || !__has_builtin(_setjmpex) +#elif !defined(_setjmpex) && __has_builtin(_setjmpex) +_ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf); +# define setjmp(buf) _setjmpex(buf) +#else _ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); -# endif # if __has_builtin(__builtin_sponentry) # define setjmp(buf) _setjmpex((buf), __builtin_sponentry()) # elif __has_builtin(__builtin_frame_address)

1 0

Alexandre Julliard : ntdll/tests: Directly link to setjmp().
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 99aee076e50ec96b6c4a38efb4c6971a7f3bda49 URL: https://gitlab.winehq.org/wine/wine/-/commit/99aee076e50ec96b6c4a38efb4c697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 17:45:18 2024 +0100 ntdll/tests: Directly link to setjmp(). --- dlls/ntdll/tests/exception.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 57d1b7f492b..01177a2c5d7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -147,7 +147,6 @@ static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); -static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif enum debugger_stages @@ -2201,9 +2200,9 @@ static void test_restore_context(void) int i; LONG pass; - if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext || !p_setjmp) + if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext) { - skip("RtlUnwindEx/RtlCaptureContext/RtlRestoreContext/_setjmp not found\n"); + skip("RtlUnwindEx/RtlCaptureContext/RtlRestoreContext not found\n"); return; } @@ -2221,12 +2220,12 @@ static void test_restore_context(void) else ok(pass < 4, "unexpected pass %ld\n", pass); - /* test with jmp using RltRestoreContext */ + /* test with jmp using RtlRestoreContext */ pass = 0; InterlockedIncrement(&pass); RtlCaptureContext(&ctx); InterlockedIncrement(&pass); /* only called once */ - p_setjmp(&buf); + setjmp((_JBTYPE *)&buf); InterlockedIncrement(&pass); if (pass == 3) { @@ -2285,7 +2284,7 @@ static void test_restore_context(void) InterlockedIncrement(&pass); pRtlCaptureContext(&ctx); InterlockedIncrement(&pass); /* only called once */ - p_setjmp(&buf); + setjmp((_JBTYPE *)&buf); InterlockedIncrement(&pass); if (pass == 3) { @@ -2294,7 +2293,7 @@ static void test_restore_context(void) rec.ExceptionInformation[0] = (DWORD64)&buf; /* uses buf.Rip instead of bogus 0xdeadbeef */ - pRtlUnwindEx((void*)buf.Rsp, (void*)0xdeadbeef, &rec, NULL, &ctx, NULL); + pRtlUnwindEx((void*)buf.Frame, (void*)0xdeadbeef, &rec, NULL, &ctx, NULL); ok(0, "shouldn't be reached\n"); } else @@ -10314,9 +10313,6 @@ static void test_backtrace(void) START_TEST(exception) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); -#if defined(__x86_64__) - HMODULE hmsvcrt = LoadLibraryA("msvcrt.dll"); -#endif hntdll = GetModuleHandleA("ntdll.dll"); my_argc = winetest_get_mainargs( &my_argv ); @@ -10509,7 +10505,6 @@ START_TEST(exception) X(RtlWow64GetCpuAreaInfo); X(RtlGetNativeSystemInformation); #undef X - p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); if (pRtlGetNativeSystemInformation) {

1 0

Alexandre Julliard : ntdll/tests: Fix a backtrace test failure on Windows ARM64.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: ffade87df1f851867d0a33a80d8d7fec9e68e6ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ffade87df1f851867d0a33a80d8d7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 20:49:54 2024 +0100 ntdll/tests: Fix a backtrace test failure on Windows ARM64. --- dlls/ntdll/tests/exception.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 01177a2c5d7..9ce0646cd47 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10294,7 +10294,7 @@ static void test_backtrace(void) ULONG hash, hash_expect; int i, count = RtlCaptureStackBackTrace( 0, 1024, buffer, &hash ); - ok( count > 1, "got %u entries\n", count ); + ok( count > 0, "got %u entries\n", count ); for (i = hash_expect = 0; i < count; i++) hash_expect += (ULONG_PTR)buffer[i]; ok( hash == hash_expect, "hash mismatch %lx / %lx\n", hash, hash_expect ); RtlPcToFileHeader( buffer[0], &module ); @@ -10302,6 +10302,7 @@ static void test_backtrace(void) module, GetModuleHandleA(0), buffer[0]); if (count && !buffer[count - 1]) count--; /* win11 32-bit */ + if (count <= 1) return; RtlPcToFileHeader( buffer[count - 1], &module ); GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); if ((p = wcsrchr( name, '\\' ))) p++;

1 0

Alexandre Julliard : ntdll: Add test for non-volatile regs in consolidated unwinds.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 5286ed3b0a40385a591ecf0daa5252d890171060 URL: https://gitlab.winehq.org/wine/wine/-/commit/5286ed3b0a40385a591ecf0daa5252… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 17:46:10 2024 +0100 ntdll: Add test for non-volatile regs in consolidated unwinds. --- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 69 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d37cd741c09..8611364b3e9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -847,7 +847,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } context->Rax = (ULONG64)retval; - context->Rip = (ULONG64)target_ip; + if (rec->ExceptionCode != STATUS_UNWIND_CONSOLIDATE) context->Rip = (ULONG64)target_ip; RtlRestoreContext(context, rec); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9ce0646cd47..eb8e92d8292 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2182,12 +2182,45 @@ static void test_KiUserCallbackDispatcher(void) #elif defined(__x86_64__) -static int consolidate_dummy_called; +static LONG consolidate_dummy_called; static PVOID CALLBACK test_consolidate_dummy(EXCEPTION_RECORD *rec) { CONTEXT *ctx = (CONTEXT *)rec->ExceptionInformation[1]; - consolidate_dummy_called = 1; - ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %Ix\n", ctx->Rip); + + switch (InterlockedIncrement(&consolidate_dummy_called)) + { + case 1: /* RtlRestoreContext */ + ok(ctx->Rip == 0xdeadbeef, "RtlRestoreContext wrong Rip, expected: 0xdeadbeef, got: %Ix\n", ctx->Rip); + ok( rec->ExceptionInformation[10] == -1, "wrong info %Ix\n", rec->ExceptionInformation[10] ); + break; + case 2: /* RtlUnwindEx */ + ok(ctx->Rip != 0xdeadbeef, "RtlUnwindEx wrong Rip, got: %Ix\n", ctx->Rip ); + if (is_arm64ec) + { + DISPATCHER_CONTEXT_NONVOLREG_ARM64 *regs = (void *)rec->ExceptionInformation[10]; + _JUMP_BUFFER *buf = (void *)rec->ExceptionInformation[3]; + ARM64EC_NT_CONTEXT *ec_ctx = (ARM64EC_NT_CONTEXT *)ctx; + int i; + + ok( rec->ExceptionInformation[10] != -1, "wrong info %Ix\n", rec->ExceptionInformation[10] ); + ok( regs->GpNvRegs[0] == buf->R12, "wrong reg X19, %Ix / %Ix\n", regs->GpNvRegs[0], buf->R12 ); + ok( regs->GpNvRegs[1] == buf->R13, "wrong reg X20, %Ix / %Ix\n", regs->GpNvRegs[1], buf->R13 ); + ok( regs->GpNvRegs[2] == buf->R14, "wrong reg X21, %Ix / %Ix\n", regs->GpNvRegs[2], buf->R14 ); + ok( regs->GpNvRegs[3] == buf->R15, "wrong reg X22, %Ix / %Ix\n", regs->GpNvRegs[3], buf->R15 ); + ok( regs->GpNvRegs[4] == 0, "wrong reg X23, %Ix / 0\n", regs->GpNvRegs[4] ); + ok( regs->GpNvRegs[5] == 0, "wrong reg X24, %Ix / 0\n", regs->GpNvRegs[5] ); + ok( regs->GpNvRegs[6] == buf->Rsi, "wrong reg X25, %Ix / %Ix\n", regs->GpNvRegs[6], buf->Rsi ); + ok( regs->GpNvRegs[7] == buf->Rdi, "wrong reg X26, %Ix / %Ix\n", regs->GpNvRegs[7], buf->Rdi ); + ok( regs->GpNvRegs[8] == buf->Rbx, "wrong reg X27, %Ix / %Ix\n", regs->GpNvRegs[8], buf->Rbx ); + ok( regs->GpNvRegs[9] == 0, "wrong reg X28, %Ix / 0\n", regs->GpNvRegs[9] ); + ok( regs->GpNvRegs[10] == buf->Rbp,"wrong reg X29, %Ix / %Ix\n", regs->GpNvRegs[10], buf->Rbp ); + for (i = 0; i < 8; i++) + ok(regs->FpNvRegs[i] == ec_ctx->V[i + 8].D[0], "wrong reg D%u, expected: %g, got: %g\n", + i + 8, regs->FpNvRegs[i], ec_ctx->V[i + 8].D[0] ); + } + else ok( rec->ExceptionInformation[10] == -1, "wrong info %Ix\n", rec->ExceptionInformation[10] ); + break; + } return (PVOID)rec->ExceptionInformation[2]; } @@ -2312,13 +2345,39 @@ static void test_restore_context(void) rec.ExceptionInformation[0] = (DWORD64)test_consolidate_dummy; rec.ExceptionInformation[1] = (DWORD64)&ctx; rec.ExceptionInformation[2] = ctx.Rip; + rec.ExceptionInformation[10] = -1; ctx.Rip = 0xdeadbeef; pRtlRestoreContext(&ctx, &rec); ok(0, "shouldn't be reached\n"); } else if (pass == 3) - ok(consolidate_dummy_called, "test_consolidate_dummy not called\n"); + ok(consolidate_dummy_called == 1, "test_consolidate_dummy not called\n"); + else + ok(0, "unexpected pass %ld\n", pass); + + /* test with consolidate through RtlUnwindEx */ + pass = 0; + InterlockedIncrement(&pass); + pRtlCaptureContext(&ctx); + InterlockedIncrement(&pass); + if (pass == 2) + { + rec.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; + rec.NumberParameters = 4; + rec.ExceptionInformation[0] = (DWORD64)test_consolidate_dummy; + rec.ExceptionInformation[1] = (DWORD64)&ctx; + rec.ExceptionInformation[2] = ctx.Rip; + rec.ExceptionInformation[3] = (DWORD64)&buf; + rec.ExceptionInformation[10] = -1; /* otherwise it doesn't get set */ + ctx.Rip = 0xdeadbeef; + /* uses consolidate callback Rip instead of bogus 0xdeadbeef */ + setjmp((_JBTYPE *)&buf); + pRtlUnwindEx((void*)buf.Frame, (void*)0xdeadbeef, &rec, NULL, &ctx, NULL); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 3) + ok(consolidate_dummy_called == 2, "test_consolidate_dummy not called\n"); else ok(0, "unexpected pass %ld\n", pass); } @@ -2348,7 +2407,7 @@ static void test___C_specific_handler(void) } memset(&rec, 0, sizeof(rec)); - rec.ExceptionFlags = 2; /* EXCEPTION_UNWINDING */ + rec.ExceptionFlags = EXCEPTION_UNWINDING; frame = 0x1234; memset(&dispatch, 0, sizeof(dispatch)); dispatch.ImageBase = (ULONG_PTR)GetModuleHandleA(NULL);

1 0

Alexandre Julliard : ntdll: Port the RtlRestoreContext test to ARM64.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 74d1dbb95a91ce8704b9ff940c6bb4b6806a5951 URL: https://gitlab.winehq.org/wine/wine/-/commit/74d1dbb95a91ce8704b9ff940c6bb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 20:23:47 2024 +0100 ntdll: Port the RtlRestoreContext test to ARM64. --- dlls/ntdll/signal_arm64.c | 106 ++++++++---------------- dlls/ntdll/tests/exception.c | 191 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 223 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : ntdll: Port the RtlRestoreContext test to ARM.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: f42316c86d6dce34f532346d5efc52625d7e9939 URL: https://gitlab.winehq.org/wine/wine/-/commit/f42316c86d6dce34f532346d5efc52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 20:24:40 2024 +0100 ntdll: Port the RtlRestoreContext test to ARM. --- dlls/ntdll/signal_arm.c | 38 ++++----- dlls/ntdll/tests/exception.c | 179 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 19 deletions(-)

1 0

Dmitry Timoshkov : wineps.drv: Return default resolution if PPD doesn't provide the list of supported resolutions.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: e42afe7daf68871fde5944d73cbcef880187871d URL: https://gitlab.winehq.org/wine/wine/-/commit/e42afe7daf68871fde5944d73cbcef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 26 20:47:57 2024 +0300 wineps.drv: Return default resolution if PPD doesn't provide the list of supported resolutions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wineps.drv/driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 7b5d2abb32d..d56118e5e2c 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -703,6 +703,15 @@ DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capa lp += 2; } } + if (!i) + { + if (output != NULL) + { + lp[0] = pi->ppd->DefaultResolution; + lp[1] = pi->ppd->DefaultResolution; + } + i = 1; + } ret = i; break; }

1 0

Andrew Nguyen : ddraw: Reserve extra space in the reference device description buffer.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 2c8d4f5abd264f68565bd393bf7c9355ecfd762a URL: https://gitlab.winehq.org/wine/wine/-/commit/2c8d4f5abd264f68565bd393bf7c93… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 10 21:38:51 2024 -0500 ddraw: Reserve extra space in the reference device description buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56367 --- dlls/ddraw/ddraw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5887854556b..efbe01f3b8b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3868,7 +3868,10 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA * never have POW2 unset in d3d7 on windows. */ if (ddraw->d3dversion != 1) { - static CHAR reference_description[] = "RGB Direct3D emulation"; + /* Tomb Raider 3 overwrites the reference device description buffer + * with its own custom string. Reserve some extra space in the array + * to avoid a buffer overrun. */ + static CHAR reference_description[64] = "RGB Direct3D emulation"; TRACE("Enumerating WineD3D D3DDevice interface.\n"); hal_desc = device_desc1;

1 0

Dmitry Timoshkov : kerberos: Allocate memory for the output token if requested.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 7c7702f91df1fab6e4137d191c3d08a32cdf4bc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c7702f91df1fab6e4137d191c3d08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 5 10:53:43 2024 +0300 kerberos: Allocate memory for the output token if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ae68c4b90c2..5a5878faf02 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -477,7 +477,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION | ISC_REQ_DELEGATE; + ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION | ISC_REQ_DELEGATE | ISC_REQ_ALLOCATE_MEMORY; char *target = NULL; NTSTATUS status; ULONG exptime; @@ -512,17 +512,41 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, params.input_token_length = input->pBuffers[idx].cbBuffer; } - if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) + { + free( target ); + return SEC_E_INVALID_TOKEN; + } + if (context_req & ISC_REQ_ALLOCATE_MEMORY) + { + output->pBuffers[idx].pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, KERBEROS_MAX_BUF ); + if (!output->pBuffers[idx].pvBuffer) + { + free( target ); + return STATUS_NO_MEMORY; + } + output->pBuffers[idx].cbBuffer = KERBEROS_MAX_BUF; + } params.output_token = output->pBuffers[idx].pvBuffer; params.output_token_length = &output->pBuffers[idx].cbBuffer; status = KRB5_CALL( initialize_context, &params ); if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { *new_context = create_context_handle( context_handle, new_context_handle ); - if (!status) + if (context_attr && (context_req & ISC_REQ_ALLOCATE_MEMORY)) + *context_attr |= ISC_RET_ALLOCATED_MEMORY; + + if (status == SEC_E_OK) + { + *mapped_context = TRUE; + expiry_to_timestamp( exptime, expiry ); + } + } + else { - *mapped_context = TRUE; - expiry_to_timestamp( exptime, expiry ); + if (context_req & ISC_REQ_ALLOCATE_MEMORY) + RtlFreeHeap( GetProcessHeap(), 0, output->pBuffers[idx].pvBuffer ); } } /* FIXME: initialize context_data */

1 0