April 2021 - Wine-Devel - list.winehq.org

[PATCH v3 2/5] ws2_32/tests: Rewrite test_events().

by Zebediah Figura

Separate the tests by event type, make them much more exhaustive, and use a simpler method of validating event sequences. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 1193 ++++++++++++++++++++------------------ 1 file changed, 639 insertions(+), 554 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9cf271d0fea..9c074811a8f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3904,628 +3904,714 @@ end: HeapFree(GetProcessHeap(), 0, buffer); } -typedef struct async_message -{ - SOCKET socket; - LPARAM lparam; - struct async_message *next; -} async_message; - -static struct async_message *messages_received; - #define WM_SOCKET (WM_USER+100) -static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) + +struct event_test_ctx { - struct async_message *message; + int is_message; + SOCKET socket; + HANDLE event; + HWND window; +}; - switch (msg) - { - case WM_SOCKET: - message = HeapAlloc(GetProcessHeap(), 0, sizeof(*message)); - message->socket = (SOCKET) wparam; - message->lparam = lparam; - message->next = NULL; - - if (messages_received) - { - struct async_message *last = messages_received; - while (last->next) last = last->next; - last->next = message; - } - else - messages_received = message; - return 0; - } - - return DefWindowProcA(hwnd, msg, wparam, lparam); -} - -static void get_event_details(int event, int *bit, char *name) +static void select_events(struct event_test_ctx *ctx, SOCKET socket, LONG events) { - switch (event) - { - case FD_ACCEPT: - if (bit) *bit = FD_ACCEPT_BIT; - if (name) strcpy(name, "FD_ACCEPT"); - break; - case FD_CONNECT: - if (bit) *bit = FD_CONNECT_BIT; - if (name) strcpy(name, "FD_CONNECT"); - break; - case FD_READ: - if (bit) *bit = FD_READ_BIT; - if (name) strcpy(name, "FD_READ"); - break; - case FD_OOB: - if (bit) *bit = FD_OOB_BIT; - if (name) strcpy(name, "FD_OOB"); - break; - case FD_WRITE: - if (bit) *bit = FD_WRITE_BIT; - if (name) strcpy(name, "FD_WRITE"); - break; - case FD_CLOSE: - if (bit) *bit = FD_CLOSE_BIT; - if (name) strcpy(name, "FD_CLOSE"); - break; - default: - if (bit) *bit = -1; - if (name) sprintf(name, "bad%x", event); - } -} - -static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) -{ - static char message[1024]; - struct async_message *curr = messages_received; - int index, error, bit = 0; - char name[12]; - int len = 1; - - message[0] = '['; - message[1] = 0; - while (1) - { - if (netEvents) - { - if (bit >= FD_MAX_EVENTS) break; - if ( !(netEvents->lNetworkEvents & (1 << bit)) ) - { - bit++; - continue; - } - get_event_details(1 << bit, &index, name); - error = netEvents->iErrorCode[index]; - bit++; - } - else - { - if (!curr) break; - if (curr->socket != s) - { - curr = curr->next; - continue; - } - get_event_details(WSAGETSELECTEVENT(curr->lparam), NULL, name); - error = WSAGETSELECTERROR(curr->lparam); - curr = curr->next; - } - - len += sprintf(message + len, "%s(%d) ", name, error); - } - if (len > 1) len--; - strcpy( message + len, "]" ); - return message; -} - -static void flush_events(SOCKET s, HANDLE hEvent) -{ - WSANETWORKEVENTS netEvents; - struct async_message *prev = NULL, *curr = messages_received; int ret; - DWORD dwRet; - if (hEvent != INVALID_HANDLE_VALUE) - { - dwRet = WaitForSingleObject(hEvent, 100); - if (dwRet == WAIT_OBJECT_0) - { - ret = WSAEnumNetworkEvents(s, hEvent, &netEvents); - ok(!ret, "failed to get network events, error %u\n", WSAGetLastError()); - } - } + if (ctx->is_message) + ret = WSAAsyncSelect(socket, ctx->window, WM_USER, events); else - { - while (curr) - { - if (curr->socket == s) - { - if (prev) prev->next = curr->next; - else messages_received = curr->next; - - HeapFree(GetProcessHeap(), 0, curr); - - if (prev) curr = prev->next; - else curr = messages_received; - } - else - { - prev = curr; - curr = curr->next; - } - } - } + ret = WSAEventSelect(socket, ctx->event, events); + ok(!ret, "failed to select, error %u\n", WSAGetLastError()); + ctx->socket = socket; } -static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPARAM *seq) +#define check_events(a, b, c, d) check_events_(__LINE__, a, b, c, d, FALSE, FALSE) +#define check_events_todo(a, b, c, d) check_events_(__LINE__, a, b, c, d, TRUE, TRUE) +#define check_events_todo_event(a, b, c, d) check_events_(__LINE__, a, b, c, d, TRUE, FALSE) +#define check_events_todo_msg(a, b, c, d) check_events_(__LINE__, a, b, c, d, FALSE, TRUE) +static void check_events_(int line, struct event_test_ctx *ctx, + LONG flag1, LONG flag2, DWORD timeout, BOOL todo_event, BOOL todo_msg) { - int event, index, error, events; - struct async_message *curr; - - if (netEvents) - { - events = netEvents->lNetworkEvents; - while (*seq) - { - event = WSAGETSELECTEVENT(*seq); - error = WSAGETSELECTERROR(*seq); - get_event_details(event, &index, NULL); - - if (!(events & event) && index != -1) - return 0; - if (events & event && index != -1) - { - if (netEvents->iErrorCode[index] != error) - return 0; - } - events &= ~event; - seq++; - } - if (events) - return 0; - } - else - { - curr = messages_received; - while (curr) - { - if (curr->socket == s) - { - if (!*seq) return 0; - if (*seq != curr->lparam) return 0; - seq++; - } - curr = curr->next; - } - if (*seq) - return 0; - } - return 1; -} - -/* checks for a sequence of events, (order only checked if window is used) */ -static void ok_event_sequence(SOCKET s, HANDLE hEvent, const LPARAM *seq) -{ - MSG msg; - WSANETWORKEVENTS events, *netEvents = NULL; int ret; - DWORD dwRet; - if (hEvent != INVALID_HANDLE_VALUE) + if (ctx->is_message) { - netEvents = &events; + BOOL any_fail = FALSE; + MSG msg; - dwRet = WaitForSingleObject(hEvent, 200); - if (dwRet == WAIT_OBJECT_0) + if (flag1) { - ret = WSAEnumNetworkEvents(s, hEvent, netEvents); + ret = PeekMessageA(&msg, ctx->window, WM_USER, WM_USER, PM_REMOVE); + while (!ret && !MsgWaitForMultipleObjects(0, NULL, FALSE, timeout, QS_POSTMESSAGE)) + ret = PeekMessageA(&msg, ctx->window, WM_USER, WM_USER, PM_REMOVE); + todo_wine_if (todo_msg && !ret) ok_(__FILE__, line)(ret, "expected a message\n"); if (ret) { - winetest_ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); - return; + ok_(__FILE__, line)(msg.wParam == ctx->socket, + "expected wparam %#Ix, got %#Ix\n", ctx->socket, msg.wParam); + todo_wine_if (todo_msg && msg.lParam != flag1) + ok_(__FILE__, line)(msg.lParam == flag1, "got first event %#Ix\n", msg.lParam); + if (msg.lParam != flag1) any_fail = TRUE; } + else + any_fail = TRUE; } - else - memset(netEvents, 0, sizeof(*netEvents)); + if (flag2) + { + ret = PeekMessageA(&msg, ctx->window, WM_USER, WM_USER, PM_REMOVE); + while (!ret && !MsgWaitForMultipleObjects(0, NULL, FALSE, timeout, QS_POSTMESSAGE)) + ret = PeekMessageA(&msg, ctx->window, WM_USER, WM_USER, PM_REMOVE); + ok_(__FILE__, line)(ret, "expected a message\n"); + ok_(__FILE__, line)(msg.wParam == ctx->socket, "got wparam %#Ix\n", msg.wParam); + todo_wine_if (todo_msg) ok_(__FILE__, line)(msg.lParam == flag2, "got second event %#Ix\n", msg.lParam); + } + ret = PeekMessageA(&msg, ctx->window, WM_USER, WM_USER, PM_REMOVE); + todo_wine_if (todo_msg && ret) ok_(__FILE__, line)(!ret, "got unexpected event %#Ix\n", msg.lParam); + if (ret) any_fail = TRUE; + + /* catch tests which succeed */ + todo_wine_if (todo_msg) ok_(__FILE__, line)(!any_fail, "event series matches\n"); } else { - Sleep(200); - /* Run the message loop a little */ - while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) - { - DispatchMessageA(&msg); - } - } + WSANETWORKEVENTS events; - winetest_ok(match_event_sequence(s, netEvents, seq), "Got sequence %s\n", dbgstr_event_seq_result(s, netEvents)); - flush_events(s, hEvent); + ret = WaitForSingleObject(ctx->event, timeout); + if (flag1 | flag2) + todo_wine_if (todo_event && ret) ok_(__FILE__, line)(!ret, "event wait timed out\n"); + else + todo_wine_if (todo_event) ok_(__FILE__, line)(ret == WAIT_TIMEOUT, "expected timeout\n"); + ret = WSAEnumNetworkEvents(ctx->socket, ctx->event, &events); + ok_(__FILE__, line)(!ret, "failed to get events, error %u\n", WSAGetLastError()); + todo_wine_if (todo_event) + ok_(__FILE__, line)(events.lNetworkEvents == (flag1 | flag2), "got events %#x\n", events.lNetworkEvents); + } } -#define ok_event_seq (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : ok_event_sequence - -static void test_events(int useMessages) +static void test_accept_events(struct event_test_ctx *ctx) { - SOCKET server = INVALID_SOCKET; - SOCKET src = INVALID_SOCKET, src2 = INVALID_SOCKET; - SOCKET dst = INVALID_SOCKET, dst2 = INVALID_SOCKET; - struct sockaddr_in addr; - HANDLE hThread = NULL; - HANDLE hEvent = INVALID_HANDLE_VALUE, hEvent2 = INVALID_HANDLE_VALUE; - WNDCLASSEXA wndclass; - HWND hWnd = NULL; - char *buffer = NULL; - int bufferSize = 1024*1024; - WSABUF bufs; - OVERLAPPED ov, ov2; - DWORD flags = 0; - DWORD bytesReturned; - DWORD id; - int len; - int ret; - DWORD dwRet; - BOOL bret; - static char szClassName[] = "wstestclass"; - static const LPARAM empty_seq[] = { 0 }; - static const LPARAM write_seq[] = { WSAMAKESELECTREPLY(FD_WRITE, 0), 0 }; - static const LPARAM read_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0), 0 }; - static const LPARAM oob_seq[] = { WSAMAKESELECTREPLY(FD_OOB, 0), 0 }; - static const LPARAM connect_seq[] = { WSAMAKESELECTREPLY(FD_CONNECT, 0), - WSAMAKESELECTREPLY(FD_WRITE, 0), 0 }; - static const LPARAM read_close_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0), - WSAMAKESELECTREPLY(FD_CLOSE, 0), 0 }; + const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + SOCKET listener, server, client, client2; + struct sockaddr_in destaddr; + int len, ret; - memset(&ov, 0, sizeof(ov)); - memset(&ov2, 0, sizeof(ov2)); + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); - /* don't use socketpair, we want connection event */ - src = socket(AF_INET, SOCK_STREAM, 0); - ok(src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); - ret = set_blocking(src, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); - - src2 = socket(AF_INET, SOCK_STREAM, 0); - ok(src2 != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - ret = set_blocking(src2, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); - - len = sizeof(BOOL); - ret = getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); - ok(bret == FALSE, "OOB not inline\n"); - - if (useMessages) - { - wndclass.cbSize = sizeof(wndclass); - wndclass.style = CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = ws2_test_WndProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = 0; - wndclass.hInstance = GetModuleHandleA(NULL); - wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); - wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); - wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); - wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wndclass.lpszClassName = szClassName; - wndclass.lpszMenuName = NULL; - RegisterClassExA(&wndclass); - - hWnd = CreateWindowA(szClassName, "WS2Test", WS_OVERLAPPEDWINDOW, - 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); - ok(!!hWnd, "failed to create window\n"); - - ret = WSAAsyncSelect(src, hWnd, WM_SOCKET, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); - ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); - - ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); - ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); - } - else - { - hEvent = WSACreateEvent(); - ok(hEvent != WSA_INVALID_EVENT, "failed to create event, error %u\n", WSAGetLastError()); - - hEvent2 = WSACreateEvent(); - ok(hEvent2 != WSA_INVALID_EVENT, "failed to create event, error %u\n", WSAGetLastError()); - - ret = WSAEventSelect(src, hEvent, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); - ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); - - ret = WSAEventSelect(src2, hEvent2, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); - ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); - } - - server = socket(AF_INET, SOCK_STREAM, 0); - ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); - - len = sizeof(addr); - ret = getsockname(server, (struct sockaddr*)&addr, &len); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); - - ret = listen(server, 2); + ret = listen(listener, 2); ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - SetLastError(0xdeadbeef); - ret = connect(src, NULL, 0); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ok(GetLastError() == WSAEFAULT, "expected 10014, got %d\n", GetLastError()); + check_events(ctx, 0, 0, 0); - ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "failed to connect, error %u\n", WSAGetLastError()); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); - ret = connect(src2, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "failed to connect, error %u\n", WSAGetLastError()); + check_events(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + if (ctx->is_message) + check_events(ctx, FD_ACCEPT, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + select_events(ctx, listener, 0); + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + if (ctx->is_message) + check_events(ctx, FD_ACCEPT, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); - len = sizeof(addr); - dst = accept(server, (struct sockaddr*)&addr, &len); - ok(dst != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); + client2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client2 != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client2, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); - len = sizeof(addr); - dst2 = accept(server, (struct sockaddr*)&addr, &len); - ok(dst2 != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); + if (!ctx->is_message) + check_events_todo(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, 0, 0, 0); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + + check_events(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, 0, 0, 0); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + + check_events(ctx, 0, 0, 0); + + closesocket(client2); + closesocket(client); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + + check_events(ctx, 0, 0, 200); + + closesocket(listener); + + /* Connect and then select. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + + /* As above, but select on a subset not containing FD_ACCEPT first. */ + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + + /* As above, but call accept() before selecting. */ + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + Sleep(200); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + check_events(ctx, 0, 0, 200); closesocket(server); - server = INVALID_SOCKET; + closesocket(client); - /* On Windows it seems when a non-blocking socket sends to a - blocking socket on the same host, the send() is BLOCKING, - so make both sockets non-blocking. src is already non-blocking - from the async select */ + closesocket(listener); +} - ret = set_blocking(dst, FALSE); - ok(!ret, "failed to set nonblocking, error %u\n", WSAGetLastError()); +static void test_connect_events(struct event_test_ctx *ctx) +{ + const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + SOCKET listener, server, client; + struct sockaddr_in destaddr; + int len, ret; - buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize); - ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - ov2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - /* FD_WRITE should be set initially, and allow us to send at least 1 byte */ - ok_event_seq(src, hEvent, connect_seq); - ok_event_seq(src2, hEvent2, connect_seq); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); - /* Test simple send/recv */ - SetLastError(0xdeadbeef); - ret = send(dst, buffer, 100, 0); - ok(ret == 100, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - ok_event_seq(src, hEvent, read_seq); + select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, 0, 0, 0); - SetLastError(0xdeadbeef); - ret = recv(src, buffer, 1, MSG_PEEK); - ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - ok_event_seq(src, hEvent, read_seq); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "failed to connect, error %u\n", WSAGetLastError()); - SetLastError(0xdeadbeef); - ret = recv(src, buffer, 50, 0); - ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - ok_event_seq(src, hEvent, read_seq); + check_events(ctx, FD_CONNECT, FD_WRITE, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, client, 0); + select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); - ret = recv(src, buffer, 50, 0); - ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); - /* fun fact - events are re-enabled even on failure, but only for messages */ - ret = send(dst, "1", 1, 0); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, read_seq); + closesocket(client); + closesocket(server); - ret = recv(src, buffer, -1, 0); - ok(ret == SOCKET_ERROR, "expected failure\n"); - ok(WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS /* < 7 */, - "got error %u\n", WSAGetLastError()); - if (useMessages) - todo_wine ok_event_seq(src, hEvent, read_seq); + /* Connect and then select. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); else - ok_event_seq(src, hEvent, empty_seq); + check_events_todo(ctx, FD_CONNECT, FD_WRITE, 200); - SetLastError(0xdeadbeef); - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - ok_event_seq(src, hEvent, empty_seq); + closesocket(client); + closesocket(server); - /* Interaction with overlapped */ - bufs.len = sizeof(char); - bufs.buf = buffer; - ret = WSARecv(src, &bufs, 1, &bytesReturned, &flags, &ov, NULL); - ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, - "WSARecv failed - %d error %d\n", ret, GetLastError()); + /* As above, but select on a subset not containing FD_CONNECT first. */ - bufs.len = sizeof(char); - bufs.buf = buffer+1; - ret = WSARecv(src, &bufs, 1, &bytesReturned, &flags, &ov2, NULL); - ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, - "WSARecv failed - %d error %d\n", ret, GetLastError()); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); - ret = send(dst, "12", 2, 0); - ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq); + select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE); - dwRet = WaitForSingleObject(ov.hEvent, 100); - ok(!dwRet, "got %u\n", dwRet); - bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE); - ok(bret, "got error %u\n", GetLastError()); - ok(bytesReturned == 1, "got %u bytes\n", bytesReturned); - ok(buffer[0] == '1', "Got %c instead of 2\n", buffer[0]); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "failed to connect, error %u\n", WSAGetLastError()); - dwRet = WaitForSingleObject(ov2.hEvent, 100); - ok(!dwRet, "got %u\n", dwRet); - bret = GetOverlappedResult((HANDLE)src, &ov2, &bytesReturned, FALSE); - ok(bret, "got error %u\n", GetLastError()); - ok(bytesReturned == 1, "got %u bytes\n", bytesReturned); - ok(buffer[1] == '2', "Got %c instead of 2\n", buffer[0]); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); - SetLastError(0xdeadbeef); - ret = send(dst, "1", 1, 0); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - ok_event_seq(src, hEvent, read_seq); + check_events_todo_msg(ctx, FD_WRITE, 0, 200); - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq); + select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - /* Notifications are delivered as soon as possible, blocked only on - * async requests on the same type */ - bufs.len = sizeof(char); - bufs.buf = buffer; - ret = WSARecv(src, &bufs, 1, &bytesReturned, &flags, &ov, NULL); - ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, - "WSARecv failed - %d error %d\n", ret, GetLastError()); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + else + check_events_todo(ctx, FD_CONNECT, 0, 200); - ret = send(dst, "1", 1, MSG_OOB); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - todo_wine ok_event_seq(src, hEvent, oob_seq); + closesocket(client); + closesocket(server); - dwRet = WaitForSingleObject(ov.hEvent, 100); - ok(dwRet == WAIT_TIMEOUT, "OOB message activated read?: %d - %d\n", dwRet, GetLastError()); + closesocket(listener); +} - ret = send(dst, "2", 1, 0); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq); +/* perform a blocking recv() even on a nonblocking socket */ +static int sync_recv(SOCKET s, void *buffer, int len, DWORD flags) +{ + OVERLAPPED overlapped = {0}; + WSABUF wsabuf; + DWORD ret_len; + int ret; - dwRet = WaitForSingleObject(ov.hEvent, 100); - ok(!dwRet, "got %u\n", dwRet); - bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE); - ok(bret, "got error %u\n", GetLastError()); - ok(bytesReturned == 1, "got %u bytes\n", bytesReturned); - ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]); - - ret = recv(src, buffer, 1, MSG_OOB); - todo_wine ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq); - - /* Flood the send queue */ - hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); - - /* Now FD_WRITE should not be set, because the socket send buffer isn't full yet */ - ok_event_seq(src, hEvent, empty_seq); - - /* Now if we send a ton of data and the 'server' does not drain it fast - * enough (set drain_pause to be sure), the socket send buffer will only - * take some of it, and we will get a short write. This will trigger - * another FD_WRITE event as soon as data is sent and more space becomes - * available, but not any earlier. */ - drain_pause = TRUE; - do + overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + wsabuf.buf = buffer; + wsabuf.len = len; + ret = WSARecv(s, &wsabuf, 1, &ret_len, &flags, &overlapped, NULL); + if (ret == -1 && WSAGetLastError() == ERROR_IO_PENDING) { - ret = send(src, buffer, bufferSize, 0); - } while (ret == bufferSize); - drain_pause = FALSE; - ok(ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ok_event_seq(src, hEvent, write_seq); - - /* Test how FD_CLOSE is handled */ - ret = send(dst, "12", 2, 0); - ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); - - /* Wait a little and let the send complete */ - Sleep(100); - closesocket(dst); - Sleep(100); - - /* We can never implement this in wine, best we can hope for is - sending FD_CLOSE after the reads complete */ - todo_wine ok_event_seq(src, hEvent, read_close_seq); - - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, read_seq); - - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - /* want it? it's here, but you can't have it */ - todo_wine ok_event_seq(src, hEvent, empty_seq); - - /* Test how FD_CLOSE is handled */ - ret = send(dst2, "12", 2, 0); - ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); - - Sleep(200); - shutdown(dst2, SD_SEND); - Sleep(200); - - todo_wine ok_event_seq(src2, hEvent2, read_close_seq); - - ret = recv(src2, buffer, 1, 0); - ok(ret == 1, "got ret %d, error %u\n", ret, WSAGetLastError()); - ok_event_seq(src2, hEvent2, read_seq); - - ret = recv(src2, buffer, 1, 0); - ok(ret == 1, "got ret %d, error %u\n", ret, WSAGetLastError()); - todo_wine ok_event_seq(src2, hEvent2, empty_seq); - - ret = send(src2, "1", 1, 0); - ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError()); - ok_event_seq(src2, hEvent2, empty_seq); - - ret = send(src2, "1", 1, 0); - ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError()); - ok_event_seq(src2, hEvent2, empty_seq); - - if (useMessages) - { - ret = WSAAsyncSelect(src, hWnd, WM_SOCKET, 0); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ret = set_blocking(src, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); - - ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ret = set_blocking(src2, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait timed out\n"); + ret = WSAGetOverlappedResult(s, &overlapped, &ret_len, FALSE, &flags); + ret = (ret ? 0 : -1); } - else + CloseHandle(overlapped.hEvent); + if (!ret) return ret_len; + return -1; +} + +static void test_write_events(struct event_test_ctx *ctx) +{ + static const int buffer_size = 1024 * 1024; + SOCKET server, client; + char *buffer; + int ret; + + buffer = malloc(buffer_size); + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + select_events(ctx, server, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + ret = send(server, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + check_events(ctx, 0, 0, 0); + + ret = sync_recv(client, buffer, buffer_size, 0); + ok(ret == 5, "got %d\n", ret); + + check_events(ctx, 0, 0, 0); + + if (!broken(1)) { - ret = WSAEventSelect(src, hEvent2, 0); - ok(!ret, "got error %u\n", WSAGetLastError()); + while (send(server, buffer, buffer_size, 0) == buffer_size); + todo_wine ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ret = set_blocking(src, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + while (recv(client, buffer, buffer_size, 0) > 0); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ret = WSAEventSelect(src2, hEvent2, 0); - ok(!ret, "got error %u\n", WSAGetLastError()); - - ret = set_blocking(src2, TRUE); - ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + /* Broken on Windows versions older than win10v1607 (though sometimes + * works regardless, for unclear reasons. */ + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, server, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); } - flush_events(src, hEvent); - closesocket(src); - flush_events(src2, hEvent2); - closesocket(src2); - HeapFree(GetProcessHeap(), 0, buffer); - closesocket(dst2); - CloseHandle(hThread); - DestroyWindow(hWnd); - CloseHandle(hEvent); - CloseHandle(hEvent2); - CloseHandle(ov.hEvent); - CloseHandle(ov2.hEvent); + closesocket(server); + closesocket(client); + + /* Despite the documentation, and unlike FD_ACCEPT and FD_RECV, calling + * send() doesn't clear the FD_WRITE bit. */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + + ret = send(server, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + check_events(ctx, FD_WRITE, 0, 200); + + closesocket(server); + closesocket(client); + + free(buffer); +} + +static void test_read_events(struct event_test_ctx *ctx) +{ + SOCKET server, client; + unsigned int i; + char buffer[8]; + int ret; + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + check_events(ctx, 0, 0, 0); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + check_events(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events(ctx, FD_READ, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + select_events(ctx, server, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events(ctx, FD_READ, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + if (!ctx->is_message) + check_events_todo(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + + ret = recv(server, buffer, 2, 0); + ok(ret == 2, "got %d\n", ret); + + check_events(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + + ret = recv(server, buffer, -1, 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS /* < Windows 7 */, + "got error %u\n", WSAGetLastError()); + + if (ctx->is_message) + check_events_todo_msg(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + + for (i = 0; i < 8; ++i) + { + ret = sync_recv(server, buffer, 1, 0); + ok(ret == 1, "got %d\n", ret); + + if (i < 7) + check_events(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + } + + /* Send data while we're not selecting. */ + + select_events(ctx, server, 0); + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + check_events(ctx, FD_READ, 0, 200); + + ret = recv(server, buffer, 5, 0); + ok(ret == 5, "got %d\n", ret); + + select_events(ctx, server, 0); + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + ret = sync_recv(server, buffer, 5, 0); + ok(ret == 5, "got %d\n", ret); + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ); + + check_events(ctx, 0, 0, 200); + + closesocket(server); + closesocket(client); +} + +static void test_oob_events(struct event_test_ctx *ctx) +{ + SOCKET server, client; + char buffer[1]; + int ret; + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + check_events(ctx, 0, 0, 0); + + ret = send(client, "a", 1, MSG_OOB); + ok(ret == 1, "got %d\n", ret); + + check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events_todo(ctx, 0, 0, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events_todo(ctx, 0, 0, 0); + select_events(ctx, server, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events_todo(ctx, 0, 0, 0); + + ret = send(client, "b", 1, MSG_OOB); + ok(ret == 1, "got %d\n", ret); + + if (!ctx->is_message) + check_events(ctx, FD_OOB, 0, 200); + check_events_todo(ctx, 0, 0, 0); + + ret = recv(server, buffer, 1, MSG_OOB); + ok(ret == 1, "got %d\n", ret); + + check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events_todo_msg(ctx, 0, 0, 0); + + ret = recv(server, buffer, 1, MSG_OOB); + todo_wine ok(ret == 1, "got %d\n", ret); + + check_events_todo_msg(ctx, 0, 0, 0); + + /* Send data while we're not selecting. */ + + select_events(ctx, server, 0); + ret = send(client, "a", 1, MSG_OOB); + ok(ret == 1, "got %d\n", ret); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + check_events_todo_msg(ctx, FD_OOB, 0, 200); + + ret = recv(server, buffer, 1, MSG_OOB); + ok(ret == 1, "got %d\n", ret); + + closesocket(server); + closesocket(client); +} + +static void test_close_events(struct event_test_ctx *ctx) +{ + SOCKET server, client; + char buffer[5]; + int ret; + + /* Test closesocket(). */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + closesocket(client); + + check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, 0, 0, 0); + select_events(ctx, server, 0); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + if (ctx->is_message) + check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(server); + + /* Test shutdown(remote end, SD_SEND). */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + shutdown(client, SD_SEND); + + check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(client); + + check_events(ctx, 0, 0, 0); + + closesocket(server); + + /* No other shutdown() call generates an event. */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + shutdown(client, SD_RECEIVE); + shutdown(server, SD_BOTH); + + check_events(ctx, 0, 0, 200); + + shutdown(client, SD_SEND); + + check_events_todo(ctx, FD_CLOSE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + /* Test sending data before calling closesocket(). */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + check_events(ctx, FD_READ, 0, 200); + + closesocket(client); + + check_events_todo(ctx, FD_CLOSE, 0, 200); + + ret = recv(server, buffer, 3, 0); + ok(ret == 3, "got %d\n", ret); + + check_events(ctx, FD_READ, 0, 200); + + ret = recv(server, buffer, 5, 0); + ok(ret == 2, "got %d\n", ret); + + check_events_todo(ctx, 0, 0, 0); + + closesocket(server); + + /* Close and then select. */ + + tcp_socketpair(&client, &server); + closesocket(client); + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + check_events(ctx, FD_CLOSE, 0, 200); + + closesocket(server); + + /* As above, but select on a subset not containing FD_CLOSE first. */ + + tcp_socketpair(&client, &server); + + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ); + + closesocket(client); + + check_events(ctx, 0, 0, 200); + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + check_events_todo_event(ctx, FD_CLOSE, 0, 200); + + closesocket(server); +} + +static void test_events(void) +{ + struct event_test_ctx ctx; + + ctx.is_message = FALSE; + ctx.event = CreateEventW(NULL, TRUE, FALSE, NULL); + + test_accept_events(&ctx); + test_connect_events(&ctx); + test_write_events(&ctx); + test_read_events(&ctx); + test_close_events(&ctx); + test_oob_events(&ctx); + + CloseHandle(ctx.event); + + ctx.is_message = TRUE; + ctx.window = CreateWindowA("Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); + + test_accept_events(&ctx); + test_connect_events(&ctx); + test_write_events(&ctx); + test_read_events(&ctx); + test_close_events(&ctx); + test_oob_events(&ctx); + + DestroyWindow(ctx.window); } static void test_ipv6only(void) @@ -8478,8 +8564,7 @@ START_TEST( sock ) test_write_watch(); test_iocp(); - test_events(0); - test_events(1); + test_events(); test_ipv6only(); test_TransmitFile(); -- 2.30.2

April 30, 2021

[PATCH v3 1/5] ws2_32/tests: Add some tests for bind().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5bd18586e51..9cf271d0fea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8373,6 +8373,71 @@ static void test_wsaioctl(void) closesocket(s); } +static void test_bind(void) +{ + const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + struct sockaddr addr; + SOCKET s, s2; + int ret, len; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + WSASetLastError(0xdeadbeef); + ret = bind(s, NULL, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + addr.sa_family = 0xdead; + WSASetLastError(0xdeadbeef); + ret = bind(s, &addr, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr) - 1); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + len = sizeof(addr); + ret = getsockname(s, &addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + + s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + WSASetLastError(0xdeadbeef); + ret = bind(s2, &addr, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEADDRINUSE, "got error %u\n", WSAGetLastError()); + + closesocket(s2); + closesocket(s); + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -8427,6 +8492,7 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_bind(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); -- 2.30.2

April 30, 2021

Re: [PATCH v2 3/5] ws2_32/tests: Add some tests for calling methods on a connecting socket.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=89654 Your paranoid android. === w2008s64 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w7u_2qxl (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w7u_adm (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w7u_el (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches sock.c:4399: Test failed: got unexpected event 0x1 sock.c:4399: Test failed: event series matches sock.c:4480: Test failed: got first event 0x1 sock.c:4480: Test failed: got unexpected event 0x20 sock.c:4480: Test failed: event series matches === w8 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w8adm (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w864 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064v1507 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064v1809 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064_tsign (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w10pro64 (32 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === wvistau64 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w2008s64 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w864 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064v1507 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064v1809 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064_2qxl (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w1064_tsign (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w10pro64 (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches sock.c:4480: Test failed: expected wparam 0x3b0, got 0x274 sock.c:4480: Test failed: got first event 0x1 sock.c:4480: Test failed: got unexpected event 0x20 sock.c:4480: Test failed: event series matches === w10pro64_ar (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w10pro64_he (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w10pro64_ja (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches === w10pro64_zh_CN (64 bit report) === ws2_32: sock.c:4376: Test failed: got -1 sock.c:4399: Test failed: expected timeout sock.c:4399: Test failed: got events 0x1 sock.c:4376: Test failed: got -1 sock.c:4378: Test failed: got unexpected event 0x1 sock.c:4378: Test failed: event series matches

April 30, 2021

[PATCH v2 7/7] wined3d: No longer export wined3d_device_set_render_state().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 813ee773478..fdde0a88cab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1650,11 +1650,9 @@ struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_st return context->state->rasterizer_state; } -void CDECL wined3d_device_set_render_state(struct wined3d_device *device, +static void wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { - TRACE("device %p, state %s (%#x), value %#x.\n", device, debug_d3drenderstate(state), state, value); - if (state > WINEHIGHEST_RENDER_STATE) { WARN("Unhandled render state %#x.\n", state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1ea837cc59a..2879e1653d3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -126,7 +126,6 @@ @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_rasterizer_state(ptr ptr) -@ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 89c0d75c1eb..dd1c15f14ed 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2484,8 +2484,6 @@ void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_rasterizer_state(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state); -void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, - enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *device, unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport); void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, -- 2.30.2

April 30, 2021

[PATCH v2 6/7] d3d11: Turn MultisampleEnable into a stub.

by Zebediah Figura

The actual effect of this is to change the algorithm for line multisampling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 10 ++++------ dlls/d3d11/device.c | 17 +++-------------- dlls/d3d11/state.c | 7 +++++++ dlls/d3d11/tests/d3d11.c | 10 ++++------ 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6c0a1c04120..41a16d9e5b8 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19056,9 +19056,8 @@ static void test_multisample_draw(void) for (i = 0; i < ARRAY_SIZE(pixels); ++i) { color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); - todo_wine_if (pixels[i].colour_tri != 0xff000000 && pixels[i].colour_tri != 0xffffffff) - ok(compare_color(color, pixels[i].colour_tri, 1), - "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + ok(compare_color(color, pixels[i].colour_tri, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); } ID3D10Device_ClearRenderTargetView(device, rtv, black); @@ -19070,9 +19069,8 @@ static void test_multisample_draw(void) for (i = 0; i < ARRAY_SIZE(pixels); ++i) { color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); - todo_wine_if (pixels[i].colour_line != 0xff000000 && pixels[i].colour_line != 0xffffffff) - ok(compare_color(color, pixels[i].colour_line, 1), - "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + ok(compare_color(color, pixels[i].colour_line, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); } ID3D10RasterizerState_Release(rs); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ee6ecd2c29c..a2c6c7a75ae 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1142,25 +1142,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; - const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) - { - wined3d_device_context_set_rasterizer_state(context->wined3d_context, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); - wined3d_mutex_unlock(); - return; - } - - wined3d_device_context_set_rasterizer_state(context->wined3d_context, rasterizer_state_impl->wined3d_state); - - desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); + rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state); + wined3d_device_context_set_rasterizer_state(context->wined3d_context, + rasterizer_state_impl ? rasterizer_state_impl->wined3d_state : NULL); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 6b287176536..d31ea16bbe8 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1152,6 +1152,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.scissor = desc->ScissorEnable; wined3d_desc.line_antialias = desc->AntialiasedLineEnable; + if (desc->MultisampleEnable) + { + static unsigned int once; + if (!once++) + FIXME("Ignoring MultisampleEnable %#x.\n", desc->MultisampleEnable); + } + /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ddb49d4166b..7229f44d6d2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32595,9 +32595,8 @@ static void test_multisample_draw(const D3D_FEATURE_LEVEL feature_level) for (i = 0; i < ARRAY_SIZE(pixels); ++i) { color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); - todo_wine_if (pixels[i].colour_tri != 0xff000000 && pixels[i].colour_tri != 0xffffffff) - ok(compare_color(color, pixels[i].colour_tri, 1), - "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + ok(compare_color(color, pixels[i].colour_tri, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); } ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); @@ -32609,9 +32608,8 @@ static void test_multisample_draw(const D3D_FEATURE_LEVEL feature_level) for (i = 0; i < ARRAY_SIZE(pixels); ++i) { color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); - todo_wine_if (pixels[i].colour_line != 0xff000000 && pixels[i].colour_line != 0xffffffff) - ok(compare_color(color, pixels[i].colour_line, 1), - "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + ok(compare_color(color, pixels[i].colour_line, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); } ID3D11RasterizerState_Release(rs); -- 2.30.2

April 30, 2021

[PATCH v2 5/7] d3d11/tests: Test drawing to a multisampled texture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 183 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 191df67a41d..ddb49d4166b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32438,6 +32438,188 @@ static void test_deferred_context_rendering(void) release_test_context(&test_context); } +static void test_multisample_draw(const D3D_FEATURE_LEVEL feature_level) +{ + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0x06bbe9c8, 0x927aedde, 0xb3c454df, 0xd739785a, 0x00000001, 0x00000140, 0x00000004, + 0x00000030, 0x00000094, 0x000000d8, 0x0000010c, 0x396e6f41, 0x0000005c, 0x0000005c, 0xfffe0200, + 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240001, 0x00000000, + 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, 0x90ff0000, 0xa0e40000, + 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, + 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + }; + static const DWORD ps_code[] = + { +#if 0 + float4 main() : sv_target + { + return float4(1.0, 1.0, 1.0, 1.0); + } +#endif + 0x43425844, 0xe8ed6039, 0xd42f2bf4, 0x38efe2fd, 0x9dc3406f, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000094, 0x000000d4, 0x000000e4, 0x396e6f41, 0x0000005c, 0x0000005c, 0xffff0200, + 0x00000038, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xffff0200, + 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x02000001, 0x800f0000, + 0xa0000000, 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, + 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, + }; + static const struct vec3 tri[] = + { + { 0.9f, -0.5f, 0.0f}, + {-0.8f, -0.9f, 0.0f}, + { 0.2f, 0.7f, 0.0f}, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 1.0f}; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + unsigned int stride, offset; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + UINT quality_levels; + unsigned int i; + DWORD color; + HRESULT hr; + + static const struct + { + unsigned int x, y; + DWORD colour_tri, colour_line; + } + pixels[] = + { + {333, 407, 0xffffffff, 0xff000000}, + {334, 407, 0xffffffff, 0xff3f3f3f}, + {335, 407, 0xffffffff, 0xff3f3f3f}, + {336, 407, 0xffffffff, 0xffbfbfbf}, + {337, 407, 0xffbfbfbf, 0xffbfbfbf}, + {338, 407, 0xff7f7f7f, 0xffffffff}, + {339, 407, 0xff3f3f3f, 0xffbfbfbf}, + {340, 407, 0xff3f3f3f, 0xffbfbfbf}, + {341, 407, 0xff000000, 0xff7f7f7f}, + {342, 407, 0xff000000, 0xff3f3f3f}, + {343, 407, 0xff000000, 0xff3f3f3f}, + {344, 407, 0xff000000, 0xff000000}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + device = test_context.device; + context = test_context.immediate_context; + + if (is_warp_device(device)) + { + /* Line multisampling is broken on all versions of Windows up to at + * least Windows 10 2009; triangle multisampling is broken on 2008. + * Both cases render as if not multisampled. */ + win_skip("Multisampling is broken on WARP.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("4xMSAA not supported.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &test_context.ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + test_context.vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(tri), tri); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(hr == S_OK, "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_VSSetShader(context, test_context.vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, test_context.ps, NULL, 0); + ID3D11DeviceContext_IASetInputLayout(context, test_context.input_layout); + stride = sizeof(*tri); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &test_context.vb, &stride, &offset); + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D11DeviceContext_Draw(context, 3, 0); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); + todo_wine_if (pixels[i].colour_tri != 0xff000000 && pixels[i].colour_tri != 0xffffffff) + ok(compare_color(color, pixels[i].colour_tri, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + } + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_LINELIST); + ID3D11DeviceContext_Draw(context, 2, 0); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); + todo_wine_if (pixels[i].colour_line != 0xff000000 && pixels[i].colour_line != 0xffffffff) + ok(compare_color(color, pixels[i].colour_line, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + } + + ID3D11RasterizerState_Release(rs); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -32608,6 +32790,7 @@ START_TEST(d3d11) queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); queue_test(test_unbound_streams); + queue_for_each_feature_level(test_multisample_draw); run_queued_tests(); } -- 2.30.2

April 30, 2021

[PATCH v2 4/7] d3d10core/tests: Test drawing to a multisampled texture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Fix test failures. These tests pass on radeonsi and AMD Windows 10. They currently fail on llvmpipe due to a bug in llvmpipe, which I intend to fix as soon as possible. dlls/d3d10core/tests/d3d10core.c | 175 +++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ccddb401aed..6c0a1c04120 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18907,6 +18907,180 @@ static void test_unbound_streams(void) release_test_context(&test_context); } +static void test_multisample_draw(void) +{ + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + float4 main() : sv_target + { + return float4(1.0, 1.0, 1.0, 1.0); + } +#endif + 0x43425844, 0x949557e7, 0x1480242b, 0x831e64fc, 0x7c0305d2, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, + }; + static const struct vec3 tri[] = + { + { 0.9f, -0.5f, 0.0f}, + {-0.8f, -0.9f, 0.0f}, + { 0.2f, 0.7f, 0.0f}, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_RASTERIZER_DESC rs_desc; + ID3D10RenderTargetView *rtv; + unsigned int stride, offset; + ID3D10RasterizerState *rs; + ID3D10Texture2D *texture; + ID3D10Device *device; + UINT quality_levels; + unsigned int i; + DWORD color; + HRESULT hr; + + static const struct + { + unsigned int x, y; + DWORD colour_tri, colour_line; + } + pixels[] = + { + {333, 407, 0xffffffff, 0xff000000}, + {334, 407, 0xffffffff, 0xff3f3f3f}, + {335, 407, 0xffffffff, 0xff3f3f3f}, + {336, 407, 0xffffffff, 0xffbfbfbf}, + {337, 407, 0xffbfbfbf, 0xffbfbfbf}, + {338, 407, 0xff7f7f7f, 0xffffffff}, + {339, 407, 0xff3f3f3f, 0xffbfbfbf}, + {340, 407, 0xff3f3f3f, 0xffbfbfbf}, + {341, 407, 0xff000000, 0xff7f7f7f}, + {342, 407, 0xff000000, 0xff3f3f3f}, + {343, 407, 0xff000000, 0xff3f3f3f}, + {344, 407, 0xff000000, 0xff000000}, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + if (is_warp_device(device)) + { + /* Line multisampling is broken on all versions of Windows up to at + * least Windows 10 2009; triangle multisampling is broken on 2008. + * Both cases render as if not multisampled. */ + win_skip("Multisampling is broken on WARP.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("4xMSAA not supported.\n"); + release_test_context(&test_context); + return; + } + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &test_context.vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &test_context.ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + test_context.vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(tri), tri); + + rs_desc.FillMode = D3D10_FILL_SOLID; + rs_desc.CullMode = D3D10_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(hr == S_OK, "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_VSSetShader(device, test_context.vs); + ID3D10Device_PSSetShader(device, test_context.ps); + ID3D10Device_IASetInputLayout(device, test_context.input_layout); + stride = sizeof(*tri); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &test_context.vb, &stride, &offset); + ID3D10Device_RSSetState(device, rs); + + ID3D10Device_ClearRenderTargetView(device, rtv, black); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D10Device_Draw(device, 4, 0); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, + (ID3D10Resource *)texture, 0, texture_desc.Format); + + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); + todo_wine_if (pixels[i].colour_tri != 0xff000000 && pixels[i].colour_tri != 0xffffffff) + ok(compare_color(color, pixels[i].colour_tri, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + } + + ID3D10Device_ClearRenderTargetView(device, rtv, black); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_LINELIST); + ID3D10Device_Draw(device, 4, 0); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, + (ID3D10Resource *)texture, 0, texture_desc.Format); + + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + color = get_texture_color(test_context.backbuffer, pixels[i].x, pixels[i].y); + todo_wine_if (pixels[i].colour_line != 0xff000000 && pixels[i].colour_line != 0xffffffff) + ok(compare_color(color, pixels[i].colour_line, 1), + "Got unexpected color 0x%08x at (%u, %u).\n", color, pixels[i].x, pixels[i].y); + } + + ID3D10RasterizerState_Release(rs); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19032,6 +19206,7 @@ START_TEST(d3d10core) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_unbound_streams); + queue_test(test_multisample_draw); run_queued_tests(); -- 2.30.2

April 30, 2021

[PATCH v2 3/7] d3d9/tests: Add some tests for D3DRS_MULTISAMPLEANTIALIAS.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/tests/visual.c | 147 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b7fcb100c93..b7eb6ad394e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -18173,6 +18173,9 @@ static void resz_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, 0xf); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "SetRenderState failed, hr %#x.\n", hr); + /* The actual multisampled depth buffer resolve happens here */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, 0x7fa05000); ok(SUCCEEDED(hr), "SetRenderState (multisampled depth buffer resolve) failed, hr %#x.\n", hr); @@ -26903,6 +26906,149 @@ static void test_sample_mask(void) ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + todo_wine ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(ms_rt); + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + +static void test_multisample_draw(void) +{ + IDirect3DSurface9 *rt, *ms_rt; + struct surface_readback rb; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + tri[] = + { + {{ 0.9f, -0.5f, 0.0f}, 0xffffffff}, + {{-0.8f, -0.9f, 0.0f}, 0xffffffff}, + {{ 0.2f, 0.7f, 0.0f}, 0xffffffff}, + }; + + static const struct + { + unsigned int x, y; + DWORD colour_ms, colour_no_ms; + } + pixels[] = + { + {338, 407, 0xffffffff, 0xffffffff}, + {339, 407, 0xffffffff, 0xffffffff}, + {340, 407, 0xff7f7f7f, 0xffffffff}, + {341, 407, 0xff7f7f7f, 0xffffffff}, + {342, 407, 0xff7f7f7f, 0xff000000}, + {343, 407, 0xff7f7f7f, 0xff000000}, + {344, 407, 0xff000000, 0xff000000}, + {345, 407, 0xff000000, 0xff000000}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 1, tri, sizeof(tri[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + colour = get_readback_color(&rb, pixels[i].x, pixels[i].y); + ok(color_match(colour, pixels[i].colour_ms, 1), + "Got unexpected colour %08x at (%u, %u).\n", colour, pixels[i].x, pixels[i].y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 1, tri, sizeof(tri[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + colour = get_readback_color(&rb, pixels[i].x, pixels[i].y); + ok(color_match(colour, pixels[i].colour_no_ms, 1), + "Got unexpected colour %08x at (%u, %u).\n", colour, pixels[i].x, pixels[i].y); + } + release_surface_readback(&rb); + hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -27062,4 +27208,5 @@ START_TEST(visual) test_sample_attached_rendertarget(); test_alpha_to_coverage(); test_sample_mask(); + test_multisample_draw(); } -- 2.30.2

April 30, 2021

[PATCH v2 2/7] d3d8/tests: Add some tests for D3DRS_MULTISAMPLEANTIALIAS.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/tests/visual.c | 144 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f25549388d0..175cd7d3514 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4527,6 +4527,9 @@ static void resz_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORWRITEENABLE, 0xf); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "SetRenderState failed, hr %#x.\n", hr); + /* The actual multisampled depth buffer resolve happens here */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_POINTSIZE, 0x7fa05000); ok(SUCCEEDED(hr), "SetRenderState (multisampled depth buffer resolve) failed, hr %#x.\n", hr); @@ -11146,6 +11149,146 @@ static void test_sample_mask(void) ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, ms_rt, NULL, 0, rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + todo_wine ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(ms_rt); + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + +static void test_multisample_draw(void) +{ + IDirect3DSurface8 *rt, *ms_rt; + struct surface_readback rb; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + tri[] = + { + {{ 0.9f, -0.5f, 0.0f}, 0xffffffff}, + {{-0.8f, -0.9f, 0.0f}, 0xffffffff}, + {{ 0.2f, 0.7f, 0.0f}, 0xffffffff}, + }; + + static const struct + { + unsigned int x, y; + DWORD colour_ms, colour_no_ms; + } + pixels[] = + { + {338, 407, 0xffffffff, 0xffffffff}, + {339, 407, 0xffffffff, 0xffffffff}, + {340, 407, 0xff7f7f7f, 0xffffffff}, + {341, 407, 0xff7f7f7f, 0xffffffff}, + {342, 407, 0xff7f7f7f, 0xff000000}, + {343, 407, 0xff7f7f7f, 0xff000000}, + {344, 407, 0xff000000, 0xff000000}, + {345, 407, 0xff000000, 0xff000000}, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, FALSE, &ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 1, tri, sizeof(tri[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEANTIALIAS, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, ms_rt, NULL, 0, rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + colour = get_readback_color(&rb, pixels[i].x, pixels[i].y); + ok(color_match(colour, pixels[i].colour_ms, 1), + "Got unexpected colour %08x at (%u, %u).\n", colour, pixels[i].x, pixels[i].y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 1, tri, sizeof(tri[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, ms_rt, NULL, 0, rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (i = 0; i < ARRAY_SIZE(pixels); ++i) + { + colour = get_readback_color(&rb, pixels[i].x, pixels[i].y); + ok(color_match(colour, pixels[i].colour_no_ms, 1), + "Got unexpected colour %08x at (%u, %u).\n", colour, pixels[i].x, pixels[i].y); + } + release_surface_readback(&rb); + hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -11235,4 +11378,5 @@ START_TEST(visual) test_alphatest(); test_desktop_window(); test_sample_mask(); + test_multisample_draw(); } -- 2.30.2

April 30, 2021

[PATCH v2 1/7] d3d8/tests: Port test_sample_mask() from d3d9.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/tests/visual.c | 88 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fc8a05a3c40..f25549388d0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11070,6 +11070,93 @@ static void test_desktop_window(void) IDirect3D8_Release(d3d); } +static void test_sample_mask(void) +{ + IDirect3DSurface8 *rt, *ms_rt; + struct surface_readback rb; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{-1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, 1.0f, 0.1f}, 0xffffffff}, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, FALSE, &ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEMASK, 0x5); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, ms_rt, NULL, 0, rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(ms_rt); + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11147,4 +11234,5 @@ START_TEST(visual) test_sysmem_draw(); test_alphatest(); test_desktop_window(); + test_sample_mask(); } -- 2.30.2

April 30, 2021