Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SECUR32_WINETEST] Sync with Wine Staging 4.0. CORE-15682

Browse source
This commit is contained in:
Amine Khaldi 2019-02-02 14:13:33 +01:00
parent 1f7c95d621
commit 739fc06f27
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/rostests/winetests/secur32/ntlm.c
View file

@ -1165,7 +1165,7 @@ static void testSignSeal(void)
trace("Testing with more than one buffer.\n");
crypt.cBuffers = sizeof(complex_data)/sizeof(complex_data[0]);
crypt.cBuffers = ARRAY_SIZE(complex_data);
crypt.pBuffers = complex_data;
complex_data[0].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM;
@ -1436,7 +1436,7 @@ static void test_cred_multiple_use(void)
getSecError(ret));
buffer_desc.ulVersion = SECBUFFER_VERSION;
buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]);
buffer_desc.cBuffers = ARRAY_SIZE(buffers);
buffer_desc.pBuffers = buffers;
ret = pInitializeSecurityContextA(&cred, NULL, NULL, ISC_REQ_CONNECTION,
@ -1487,7 +1487,7 @@ static void test_null_auth_data(void)
buffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, buffers[0].cbBuffer);
buffer_desc.ulVersion = SECBUFFER_VERSION;
buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]);
buffer_desc.cBuffers = ARRAY_SIZE(buffers);
buffer_desc.pBuffers = buffers;
size = sizeof(user);

22
modules/rostests/winetests/secur32/schannel.c
View file

@ -202,6 +202,7 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots)
X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client");
X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client");
X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client");
X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client");
#undef X
if(protocols.grbitProtocol)
@ -560,11 +561,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert)
cert_cnt++;
}
ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt);
ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt);
ok(incl_remote, "context does not contain cert itself\n");
}
static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n";
static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: test.winehq.org\r\nConnection: close\r\n\r\n";
static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size)
{
@ -690,7 +691,7 @@ static void test_communication(void)
SecBufferDesc buffers[2];
SecBuffer *buf;
unsigned buf_size = 4000;
unsigned buf_size = 8192;
unsigned char *data;
unsigned data_size;
@ -700,7 +701,7 @@ static void test_communication(void)
return;
}
/* Create a socket and connect to www.winehq.org */
/* Create a socket and connect to test.winehq.org */
ret = WSAStartup(0x0202, &wsa_data);
if (ret)
{
@ -708,10 +709,10 @@ static void test_communication(void)
return;
}
host = gethostbyname("www.winehq.org");
host = gethostbyname("test.winehq.org");
if (!host)
{
skip("Can't resolve www.winehq.org\n");
skip("Can't resolve test.winehq.org\n");
return;
}
@ -728,7 +729,7 @@ static void test_communication(void)
ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
if (ret == SOCKET_ERROR)
{
skip("Can't connect to www.winehq.org\n");
skip("Can't connect to test.winehq.org\n");
return;
}
@ -806,7 +807,7 @@ todo_wine
ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n");
ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n");
buffers[1].cBuffers = 4;
buffers[1].cBuffers = 1;
buffers[1].pBuffers[0].cbBuffer = 0;
status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
@ -865,10 +866,9 @@ todo_wine
}
ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n");
ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */,
"InitializeSecurityContext failed: %08x\n", status);
ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status);
if(status != SEC_E_OK) {
win_skip("Handshake failed\n");
skip("Handshake failed\n");
return;
}

10
modules/rostests/winetests/secur32/secur32.c
View file

@ -67,7 +67,7 @@ static void testGetComputerObjectNameA(void)
BOOLEAN rc;
UINT i;
for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
for (i = 0; i < ARRAY_SIZE(formats); i++) {
size = 0;
SetLastError(0xdeadbeef);
rc = pGetComputerObjectNameA(formats[i], NULL, &size);
@ -112,7 +112,7 @@ static void testGetComputerObjectNameW(void)
BOOLEAN rc;
UINT i;
for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
for (i = 0; i < ARRAY_SIZE(formats); i++) {
size = 0;
SetLastError(0xdeadbeef);
rc = pGetComputerObjectNameW(formats[i], NULL, &size);
@ -134,7 +134,7 @@ static void testGetComputerObjectNameW(void)
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue;
size = sizeof(nameW)/sizeof(nameW[0]);
size = ARRAY_SIZE(nameW);
SetLastError(0xdeadbeef);
rc = pGetComputerObjectNameW(formats[i], nameW, &size);
switch (formats[i])
@ -158,7 +158,7 @@ static void testGetUserNameExA(void)
BOOLEAN rc;
UINT i;
for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
for (i = 0; i < ARRAY_SIZE(formats); i++) {
size = sizeof(name);
ZeroMemory(name, sizeof(name));
rc = pGetUserNameExA(formats[i], name, &size);
@ -205,7 +205,7 @@ static void testGetUserNameExW(void)
BOOLEAN rc;
UINT i;
for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
for (i = 0; i < ARRAY_SIZE(formats); i++) {
size = sizeof(nameW);
ZeroMemory(nameW, sizeof(nameW));
rc = pGetUserNameExW(formats[i], nameW, &size);