wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9a4992173e165b04ff79d5283f81064f7585e7ad.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-01-27 11:50:15 +11:00
parent b8a377e8d7
commit b1a5648b37
8 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/secur32-InitializeSecurityContextW/0001-secur32-Input-Parameter-should-be-NULL-on-first-call.patch
View File

@@ -1,4 +1,4 @@
From 3b7ee6a45c7b33aeccc9ccf7460d1e4d69cc7023 Mon Sep 17 00:00:00 2001
From 1f31bae540fcdd419eda6d012317f904860ec445 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,11 +13,11 @@ 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 32181b3b35f..bca15750bc9 100644
index 141a191c7c6..443bf8f3d6c 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -724,7 +724,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
ptsExpiry->HighPart = 0;
@@ -734,7 +734,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
return SEC_E_INSUFFICIENT_MEMORY;
}
- if (!phContext)
@@ -26,10 +26,10 @@ index 32181b3b35f..bca15750bc9 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 7cb3871193c..27381d60b38 100644
index 6c15addf2fc..47f7ca0ef3a 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -1319,7 +1319,7 @@ todo_wine
@@ -1397,7 +1397,7 @@ todo_wine
status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
@@ -38,8 +38,8 @@ index 7cb3871193c..27381d60b38 100644
if (status != SEC_I_CONTINUE_NEEDED)
{
skip("skipping remaining renegotiate test\n");
@@ -1357,7 +1357,7 @@ todo_wine
ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
@@ -1439,7 +1439,7 @@ todo_wine
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);
@@ -47,7 +47,7 @@ index 7cb3871193c..27381d60b38 100644
buf = &buffers[0].pBuffers[0];
buf->cbBuffer = buf_size;
@@ -1367,7 +1367,7 @@ todo_wine
@@ -1449,7 +1449,7 @@ todo_wine
buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
status = DecryptMessage(&context, &buffers[0], 0, NULL);
@@ -57,5 +57,5 @@ index 7cb3871193c..27381d60b38 100644
{
ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");
--
2.33.0
2.34.1