Skip to content

W
wine-winehq
Commit 3cb350b2 authored by Giovanni Mascellani's avatar Giovanni Mascellani Committed by Alexandre Julliard
Browse files
Options

dxgi/tests: Rename the waitable object from "event" to "semaphore".

From the tests it behaves more like a semaphore than like an event. I'm not testing explicitly because I'm not sure it's relevant, but another indication is that calling ReleaseSemaphore() returns ERROR_ACCESS_DENIED, while calling SetEvent() returns ERROR_INVALID_HANDLE.
parent 54bf9a93
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
dlls/dxgi/tests/dxgi.c
View file @ 3cb350b2
...@@ -6977,11 +6977,11 @@ static void test_factory_check_feature_support(void) ...@@ -6977,11 +6977,11 @@ static void test_factory_check_feature_support(void)
static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
{ {
DXGI_SWAP_CHAIN_DESC1 swapchain_desc; DXGI_SWAP_CHAIN_DESC1 swapchain_desc;
HANDLE semaphore, semaphore2;
IDXGISwapChain2 *swapchain2; IDXGISwapChain2 *swapchain2;
IDXGISwapChain1 *swapchain1; IDXGISwapChain1 *swapchain1;
IDXGIFactory2 *factory2; IDXGIFactory2 *factory2;
IDXGIFactory *factory; IDXGIFactory *factory;
HANDLE event, event2;
UINT frame_latency; UINT frame_latency;
DWORD wait_result; DWORD wait_result;
ULONG ref_count; ULONG ref_count;
...@@ -7036,8 +7036,8 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ...@@ -7036,8 +7036,8 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
ok(frame_latency == 0xdeadbeef, "Got unexpected frame latency %#x.\n", frame_latency); ok(frame_latency == 0xdeadbeef, "Got unexpected frame latency %#x.\n", frame_latency);
hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 1); hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 1);
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); semaphore = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
ok(!event, "Got unexpected event %p.\n", event); ok(!semaphore, "Got unexpected semaphore %p.\n", semaphore);
ref_count = IDXGISwapChain2_Release(swapchain2); ref_count = IDXGISwapChain2_Release(swapchain2);
ok(!ref_count, "Swap chain has %lu references left.\n", ref_count); ok(!ref_count, "Swap chain has %lu references left.\n", ref_count);
...@@ -7052,26 +7052,25 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ...@@ -7052,26 +7052,25 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain1_Release(swapchain1); IDXGISwapChain1_Release(swapchain1);
event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); semaphore = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
ok(!!event, "Got unexpected NULL event.\n"); ok(!!semaphore, "Got unexpected NULL semaphore.\n");
/* a new duplicate handle is returned each time */ /* a new duplicate handle is returned each time */
event2 = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); semaphore2 = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
ok(!!event2, "Got unexpected NULL event.\n"); ok(!!semaphore2, "Got unexpected NULL semaphore.\n");
ok(event != event2, "Got the same event twice %p.\n", event); ok(semaphore != semaphore2, "Got the same semaphore twice %p.\n", semaphore);
ret = CloseHandle(event); ret = CloseHandle(semaphore);
ok(!!ret, "Failed to close handle, last error %lu.\n", GetLastError()); ok(!!ret, "Failed to close handle, last error %lu.\n", GetLastError());
ret = CloseHandle(event2); ret = CloseHandle(semaphore2);
ok(!!ret, "Failed to close handle, last error %lu.\n", GetLastError()); ok(!!ret, "Failed to close handle, last error %lu.\n", GetLastError());
event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); semaphore = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
ok(!!event, "Got unexpected NULL event.\n"); ok(!!semaphore, "Got unexpected NULL semaphore.\n");
/* auto-reset event */ wait_result = WaitForSingleObject(semaphore, 0);
wait_result = WaitForSingleObject(event, 0);
ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 0); wait_result = WaitForSingleObject(semaphore, 0);
ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency);
...@@ -7090,11 +7089,11 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ...@@ -7090,11 +7089,11 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame_latency == 3, "Got unexpected frame latency %#x.\n", frame_latency); ok(frame_latency == 3, "Got unexpected frame latency %#x.\n", frame_latency);
wait_result = WaitForSingleObject(event, 0); wait_result = WaitForSingleObject(semaphore, 0);
todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 0); wait_result = WaitForSingleObject(semaphore, 0);
todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 100); wait_result = WaitForSingleObject(semaphore, 100);
ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
...@@ -7102,11 +7101,11 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ...@@ -7102,11 +7101,11 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain2_Present(swapchain2, 0, 0); hr = IDXGISwapChain2_Present(swapchain2, 0, 0);
ok(hr == S_OK, "Present %u failed with hr %#lx.\n", i, hr); ok(hr == S_OK, "Present %u failed with hr %#lx.\n", i, hr);
wait_result = WaitForSingleObject(event, 100); wait_result = WaitForSingleObject(semaphore, 100);
ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
} }
wait_result = WaitForSingleObject(event, 100); wait_result = WaitForSingleObject(semaphore, 100);
ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
ref_count = IDXGISwapChain2_Release(swapchain2); ref_count = IDXGISwapChain2_Release(swapchain2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment