Rebase against 18230d23c599f1f5f9dd419dccc11c49117cc3b8.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-05 09:58:02 +11:00
parent 0648126dae
commit a79a08a6f7
10 changed files with 148 additions and 80 deletions

View File

@@ -1,4 +1,4 @@
From 1f31bae540fcdd419eda6d012317f904860ec445 Mon Sep 17 00:00:00 2001
From b039e9a489b99619027dfd1a8233c08bfdb362ce Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 21 Apr 2021 21:06:55 +1000
Subject: [PATCH] secur32: Input Parameter should be NULL on first call to
@@ -13,7 +13,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index 141a191c7c6..443bf8f3d6c 100644
index c7d62c47758..0ac9e522ce3 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -734,7 +734,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
@@ -26,33 +26,33 @@ index 141a191c7c6..443bf8f3d6c 100644
ULONG_PTR handle;
struct create_session_params create_params;
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index 6c15addf2fc..47f7ca0ef3a 100644
index 1cf751a3198..d0aaf2a13d5 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -1397,7 +1397,7 @@ todo_wine
@@ -1397,7 +1397,7 @@ static void test_communication(void)
status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
- todo_wine ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status);
+ ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status);
- todo_wine ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08lx\n", status);
+ ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08lx\n", status);
if (status != SEC_I_CONTINUE_NEEDED)
{
skip("skipping remaining renegotiate test\n");
@@ -1439,7 +1439,7 @@ todo_wine
@@ -1439,7 +1439,7 @@ static void test_communication(void)
ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL);
buffers[1].pBuffers[0].cbBuffer = buf_size;
}
- ok (status == SEC_E_OK, "got %08x\n", status);
+ todo_wine ok (status == SEC_E_OK, "got %08x\n", status);
- ok (status == SEC_E_OK, "got %08lx\n", status);
+ todo_wine ok (status == SEC_E_OK, "got %08lx\n", status);
buf = &buffers[0].pBuffers[0];
buf->cbBuffer = buf_size;
@@ -1449,7 +1449,7 @@ todo_wine
@@ -1449,7 +1449,7 @@ static void test_communication(void)
buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
status = DecryptMessage(&context, &buffers[0], 0, NULL);
- ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status);
+ todo_wine ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status);
- ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status);
+ todo_wine ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status);
if (status == SEC_E_OK)
{
ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");