January 2022 - Wine-Devel - list.winehq.org

[PATCH 09/24] mfplat/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mfplat/tests/mfplat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 207bd61b8dc..f89a5202d80 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -918,7 +918,7 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); -todo_wine + todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); @@ -6920,7 +6920,7 @@ static void test_d3d12_surface_buffer(void) hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); if (hr == E_INVALIDARG) { -todo_wine + todo_wine win_skip("D3D12 resource buffers are not supported.\n"); goto notsupported; } @@ -7088,7 +7088,7 @@ static void test_sample_allocator_sysmem(void) hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!count, "Unexpected count %d.\n", count); check_interface(sample, &IID_IMFTrackedSample, TRUE); @@ -7112,7 +7112,7 @@ todo_wine hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine EXPECT_REF(video_type, 2); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); @@ -7455,7 +7455,7 @@ static void test_sample_allocator_d3d11(void) hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) { - todo_wine + todo_wine ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); IMFVideoSampleAllocatorEx_Release(allocatorex); continue; @@ -7540,7 +7540,7 @@ static void test_sample_allocator_d3d12(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == MF_E_UNEXPECTED) /* Some Win10 versions fail. */, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) goto done; -- 2.35.0

Jan. 27, 2022

[PATCH 08/24] mfmediaengine/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mfmediaengine/tests/mfmediaengine.c | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1f0a2eda1b3..8d424908cd6 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -301,7 +301,7 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetNetworkState(media_engine); @@ -324,16 +324,16 @@ todo_wine ok(state == 100, "Unexpected state %d.\n", state); hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Load(media_engine); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); str = SysAllocString(L"video/mp4"); hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); SysFreeString(str); @@ -347,7 +347,7 @@ todo_wine ok(val == 0.0, "Unexpected time %f.\n", val); hr = IMFMediaEngine_SetCurrentTime(media_engine, 1.0); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetStartTime(media_engine); @@ -366,11 +366,11 @@ todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetSeekable(media_engine, &time_range); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_IsEnded(media_engine); @@ -397,11 +397,11 @@ todo_wine ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Pause(media_engine); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetMuted(media_engine); @@ -700,7 +700,7 @@ static void test_time_range(void) ok(end == 1.0, "Unexpected end %.e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); count = IMFMediaTimeRange_GetLength(range); @@ -708,30 +708,30 @@ todo_wine hr = IMFMediaTimeRange_GetStart(range, 0, &start); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(end == 3.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); count = IMFMediaTimeRange_GetLength(range); -todo_wine + todo_wine ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(end == 3.0, "Unexpected end %.8e.\n", end); start = 0.0; -- 2.35.0

Jan. 27, 2022

[PATCH 07/24] mf/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mf/tests/mf.c | 68 +++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f628a1116e4..828bb941482 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1401,7 +1401,7 @@ static void test_media_session_rate_control(void) ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); hr = IMFClock_GetProperties(clock, &clock_props); @@ -1414,7 +1414,7 @@ todo_wine ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); rate = 0.0f; @@ -1941,7 +1941,7 @@ static void test_topology_loader(void) /* Empty topology */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); /* Add source node. */ @@ -1983,7 +1983,7 @@ todo_wine /* Source node only. */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); @@ -2009,7 +2009,7 @@ todo_wine ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); @@ -2043,7 +2043,7 @@ todo_wine ok(!count, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine_if(test->flags & LOADER_TODO) + todo_wine_if(test->flags & LOADER_TODO) ok(hr == test->expected_result, "Unexpected hr %#x on test %u.\n", hr, i); ok(full_topology != topology, "Unexpected instance.\n"); @@ -2051,7 +2051,7 @@ todo_wine_if(test->flags & LOADER_TODO) { hr = IMFTopology_GetCount(full_topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); -todo_wine + todo_wine ok(count == 1, "Unexpected count %u.\n", count); value = 0xdeadbeef; @@ -2068,7 +2068,7 @@ todo_wine { hr = IMFTopology_GetNodeCount(full_topology, &node_count); ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); - todo_wine_if(test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) + todo_wine_if(test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) ok(node_count == count, "Unexpected node count %u.\n", node_count); hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id); @@ -3437,9 +3437,9 @@ static void test_video_processor(void) goto failed; } -todo_wine + todo_wine check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); -todo_wine + todo_wine check_interface(transform, &IID_IMFRealTimeClientEx, TRUE); check_interface(transform, &IID_IMFMediaEventGenerator, FALSE); check_interface(transform, &IID_IMFShutdown, FALSE); @@ -3450,7 +3450,7 @@ todo_wine hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!!count, "Unexpected attribute count %u.\n", count); value = 0; @@ -3485,14 +3485,14 @@ todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStatus(transform, 0, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStatus(transform, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 0, &attributes); @@ -3504,27 +3504,27 @@ todo_wine IMFAttributes_Release(attributes2); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 1, &media_type); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 1, &media_type); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); memset(&input_info, 0xcc, sizeof(input_info)); @@ -3549,7 +3549,7 @@ todo_wine { { if (FAILED(hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type))) { - todo_wine + todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); break; } @@ -3630,22 +3630,22 @@ todo_wine { ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set output type, hr %#x.\n", hr); memset(&output_info, 0, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); -todo_wine + todo_wine ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); ok(output_info.dwFlags == 0, "Unexpected flags %#x.\n", output_info.dwFlags); -todo_wine + todo_wine ok(output_info.cbSize > 0, "Unexpected size %u.\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "Unexpected alignment %u.\n", output_info.cbAlignment); @@ -3659,24 +3659,24 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to push a sample, hr %#x.\n", hr); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); -todo_wine + todo_wine ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); memset(&output_buffer, 0, sizeof(output_buffer)); output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3687,7 +3687,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3705,7 +3705,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Failed to get output buffer, hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3885,7 +3885,7 @@ static void test_sar(void) ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); -todo_wine + todo_wine ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -3968,7 +3968,7 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_SetPresentationClock(sink, present_clock); -todo_wine + todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = MFCreateSystemTimeSource(&time_source); @@ -4215,7 +4215,7 @@ todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaSink_Release(sink); @@ -4531,7 +4531,7 @@ todo_wine { /* Activate again. */ hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); -todo_wine + todo_wine ok(sink == sink2, "Unexpected instance.\n"); IMFMediaSink_Release(sink2); -- 2.35.0

Jan. 27, 2022

[PATCH 06/24] kernel32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/actctx.c | 8 ++++---- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/mailslot.c | 2 +- dlls/kernel32/tests/sync.c | 6 +++--- dlls/kernel32/tests/thread.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index e103dfdcf2b..c26eb08f306 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2668,7 +2668,7 @@ todo_wine { SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine + todo_wine ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, "got error %d\n", GetLastError()); @@ -2770,7 +2770,7 @@ static void test_ZombifyActCtx(void) SetLastError(0xdeadbeef); ret = ZombifyActCtx(NULL); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); @@ -2800,7 +2800,7 @@ todo_wine ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret); memset(&basicinfo, 0xff, sizeof(basicinfo)); @@ -2822,7 +2822,7 @@ todo_wine /* one more time */ ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret); ret = DeactivateActCtx(0, cookie); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 60fe532adc2..f8e49491a7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5313,12 +5313,12 @@ static void test_SetFileInformationByHandle(void) /* test FileDispositionInfo, additional details already covered by ntdll tests */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); memset(&basicinfo, 0, sizeof(basicinfo)); @@ -5409,7 +5409,7 @@ static void test_SetFileRenameInfo(void) fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, "FileRenameInfo unexpected result %d\n", GetLastError()); CloseHandle(file); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..6b5099ea612 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2442,7 +2442,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); -todo_wine + todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -3308,7 +3308,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine + todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -3318,7 +3318,7 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine + todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..8f48b89334c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5519,7 +5519,7 @@ static void test_GetThreadPreferredUILanguages(void) ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine + todo_wine ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); HeapFree(GetProcessHeap(), 0, buf); diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 9da960fba81..7e488566dbb 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -88,7 +88,7 @@ static int mailslot_test(void) SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); ok(!ret, "ReadFile should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); ok(count == 0, "expected 0, got %u\n", count); diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 827f4c53aa0..a6ee90b81f3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -202,9 +202,9 @@ static void test_mutex(void) SetLastError(0xdeadbeef); hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); -todo_wine + todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -249,7 +249,7 @@ todo_wine } } -todo_wine + todo_wine ok( failed == 0x0de0fffe, "open succeeded when it shouldn't: %x\n", failed); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e9fd90b1889..6ccf7af85f8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2338,7 +2338,7 @@ static void test_thread_info(void) break; case ThreadIsIoPending: -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; -- 2.35.0

Jan. 27, 2022

[PATCH 05/24] hlink/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/hlink/tests/hlink.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c905093bd86..1d2c530b52d 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2364,9 +2364,9 @@ if (0) { /* these currently open a browser window on wine */ CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_GetBindInfo); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); todo_wine { @@ -2374,15 +2374,15 @@ todo_wine { CHECK_CALLED(BindStatusCallback_OnObjectAvailable); } CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_OnStopBinding); ok(bind_callback_refs == 1, "Got unexpected refcount %d.\n", bind_callback_refs); @@ -2400,7 +2400,7 @@ todo_wine CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); @@ -2425,13 +2425,13 @@ todo_wine (IUnknown *)&HlinkTarget); ok(hres == S_OK, "Got hr %#x.\n", hres); CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); @@ -2456,10 +2456,10 @@ todo_wine ok(hres == MK_S_ASYNCHRONOUS, "Navigate failed: %#x\n", hres); CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_GetBindInfo); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); @@ -2491,13 +2491,13 @@ todo_wine ok(hres == S_OK, "Got hr %#x.\n", hres); CHECK_CALLED(BindStatusCallback_OnObjectAvailable); CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); -- 2.35.0

Jan. 27, 2022

[PATCH 04/24] gdiplus/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdiplus/tests/customlinecap.c | 4 +-- dlls/gdiplus/tests/font.c | 40 ++++++++++----------- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++--------------- dlls/gdiplus/tests/image.c | 8 ++--- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index e4ec329b935..26175ca8f66 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -283,12 +283,12 @@ static void test_create_adjustable_cap(void) ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); -todo_wine + todo_wine ok(stat == Ok, "Unexpected return code, %d\n", stat); stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); ok(stat == Ok, "Unexpected return code, %d\n", stat); -todo_wine + todo_wine ok(base == LineCapSquare, "Unexpected base cap %d\n", base); /* Base inset */ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 031e4688c6c..d8f8a474742 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -934,7 +934,7 @@ static void test_font_substitution(void) lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine + todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); /* FIXME: remove when wine is fixed */ @@ -944,7 +944,7 @@ todo_wine lf.lfFaceName[0] = 0; font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine + todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); /* FIXME: remove when wine is fixed */ @@ -1009,7 +1009,7 @@ static void test_font_transform(void) expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1053,7 +1053,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1074,9 +1074,9 @@ todo_wine DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine + todo_wine expectf_(-300.0, bounds.Y, 0.15); -todo_wine + todo_wine expectf(height * 3.0, bounds.Height); /* scale + ratate matrix */ @@ -1099,7 +1099,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1119,11 +1119,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-43.814377, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-212.235611, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(340.847534, bounds.Height, 0.05); /* scale + ratate + shear matrix */ @@ -1133,7 +1133,7 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine + todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); expect_(3099, lf.lfEscapement, 1); @@ -1147,7 +1147,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1167,11 +1167,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-636.706848, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-175.257523, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(1532.984985, bounds.Height, 0.05); /* scale + ratate + shear + translate matrix */ @@ -1181,7 +1181,7 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine + todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); expect_(3099, lf.lfEscapement, 1); @@ -1195,7 +1195,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1215,11 +1215,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-626.706848, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-155.257523, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(1532.984985, bounds.Height, 0.05); GdipDeleteMatrix(matrix); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d0454edb4a4..690efa8ac1e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3803,7 +3803,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3820,7 +3820,7 @@ todo_wine expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3892,7 +3892,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3909,7 +3909,7 @@ todo_wine expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3921,7 +3921,7 @@ todo_wine height *= td[i].page_scale; /*trace("%u: unit %u, %.1fx%.1f dpi, scale %.1f, height %f, pixels %f\n", i, td[i].unit, td[i].res_x, td[i].res_y, td[i].page_scale, bounds.Height, height);*/ -todo_wine + todo_wine expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); @@ -4376,7 +4376,7 @@ static void test_font_height_scaling(void) status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status); /*trace("bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height);*/ -todo_wine + todo_wine expectf_(font_height + margin_y, bounds.Height, 0.005); ptf.X = 0; @@ -4384,14 +4384,14 @@ todo_wine status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; -todo_wine + todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); ptf.Y /= 100.0; match = fabs(100.0 - ptf.Y) <= 1.0; -todo_wine + todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -4499,7 +4499,7 @@ static void test_measure_string(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf(width, bounds.Width); -todo_wine + todo_wine expectf(height / 2.0, bounds.Height); range.First = 0; @@ -4519,7 +4519,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width - margin_x*2.0, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0); width_rgn = bounds.Width; @@ -4575,7 +4575,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width_1, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0); status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); @@ -4618,7 +4618,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(width, bounds.Width, 0.01); -todo_wine + todo_wine expectf(height, bounds.Height); set_rect_empty(&rect); @@ -4711,7 +4711,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width - margin_x*2.0, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0); width_rgn = bounds.Width; @@ -4730,9 +4730,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 + height/2.0, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4746,9 +4746,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 - width/2.0, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 - height/2.0, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4762,9 +4762,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); -todo_wine + todo_wine expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4778,9 +4778,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); -todo_wine + todo_wine expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4798,9 +4798,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 + width, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 + height, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4814,9 +4814,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 - width, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 - height, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4830,9 +4830,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 + width_rgn, bounds.X, 2.0); -todo_wine + todo_wine expectf_(5.0 + height_rgn, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4846,9 +4846,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 - width_rgn, bounds.X, 2.0); -todo_wine + todo_wine expectf_(5.0 - height_rgn, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ca08ae49ad7..c52c90f6799 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5881,7 +5881,7 @@ static void test_GdipInitializePalette(void) palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedBW, 0, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x200, palette->Flags); expect(2, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5892,7 +5892,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, NULL); expect(Ok, status); -todo_wine + todo_wine expect(0x300, palette->Flags); expect(16, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5904,7 +5904,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x300, palette->Flags); expect(16, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5916,7 +5916,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone252, 1, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x800, palette->Flags); expect(252, palette->Count); expect(0xff000000, palette->Entries[0]); -- 2.35.0

Jan. 27, 2022

[PATCH 03/24] gdi32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdi32/tests/font.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 93793ad7108..3e1ed7f7652 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2789,7 +2789,7 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine + todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 03ac72254cc..bc626d284ca 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1830,15 +1830,15 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine + todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); -todo_wine + todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); -todo_wine + todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); @@ -4130,7 +4130,7 @@ static void test_nonexistent_font(void) hfont = CreateFontIndirectA(&lf); hfont = SelectObject(hdc, hfont); GetTextFaceA(hdc, sizeof(buf), buf); -todo_wine /* Wine uses Arial for all substitutions */ + todo_wine /* Wine uses Arial for all substitutions */ ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ || !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "Got %s\n", buf); @@ -4165,10 +4165,10 @@ todo_wine /* Wine uses Arial for all substitutions */ for (i = 0; i < ARRAY_SIZE(font_subst); i++) { ret = is_font_installed(font_subst[i].name); -todo_wine + todo_wine ok(ret, "%s should be enumerated\n", font_subst[i].name); ret = is_truetype_font_installed(font_subst[i].name); -todo_wine + todo_wine ok(ret, "%s should be enumerated\n", font_subst[i].name); memset(&lf, 0, sizeof(lf)); @@ -4511,7 +4511,7 @@ static void test_oemcharset(void) hfont = CreateFontIndirectA(&lf); old_hfont = SelectObject(hdc, hfont); charset = GetTextCharset(hdc); -todo_wine + todo_wine ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); hfont = SelectObject(hdc, old_hfont); GetObjectA(hfont, sizeof(clf), &clf); @@ -5090,7 +5090,7 @@ static void test_realization_info(const char *name, DWORD size, BOOL is_memory_r /* Zero buffer size. */ memset(data, 0xcc, size); ret = pGetFontFileData(info.instance_id, 0, 16, data, 0); -todo_wine + todo_wine ok(ret == 0 && GetLastError() == ERROR_NOACCESS, "Unexpected return value %d, error %d\n", ret, GetLastError()); ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); @@ -5153,7 +5153,7 @@ static void test_AddFontMemResource(void) ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); bRet = is_truetype_font_installed("wine_test"); -todo_wine + todo_wine ok(!bRet, "Font wine_test should not be enumerated.\n"); test_realization_info("wine_test", font_size, TRUE); @@ -5758,7 +5758,7 @@ static void test_GetGlyphOutline_metric_clipping(void) /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ GetTextMetricsW(hdc, &tmW); -todo_wine + todo_wine ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); SelectObject(hdc, hfont_prev); -- 2.35.0

Jan. 27, 2022

[PATCH 02/24] evr/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/evr/tests/evr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 046a7e4db59..acbb2b1869a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -645,15 +645,15 @@ static void test_default_mixer(void) ok(color == 0x121212, "Unexpected color %#x.\n", color); hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); IMFVideoProcessor_Release(processor); @@ -1284,11 +1284,11 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -1300,7 +1300,7 @@ todo_wine IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -1313,11 +1313,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) CoTaskMemFree(guids); @@ -2263,21 +2263,21 @@ static void test_presenter_quality_control(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); -- 2.35.0

Jan. 27, 2022

[PATCH 01/24] dxva2/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dxva2/tests/dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 5de39fe1360..d94299f0c78 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); -- 2.35.0

Jan. 27, 2022

Re: [RFC PATCH v2 2/5] server: Add a new server request "notify_async_direct_result."

by Jinoh Kang

On 1/28/22 04:05, Jinoh Kang wrote: > Some I/O operations need a way to "queue" the async to the target object > first, even if the operation itself is to be completed synchronously. > After synchronous completion, it needs a way to notify the > IO_STATUS_BLOCK values back to the server. > > Add a new wineserver request, "notify_async_direct_result", which > notifies direct (i.e. synchronous) completion of async from the same > thread. > > Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> > --- > > Notes: > v1 -> v2: dequeue async after failed completion > > server/async.c | 84 ++++++++++++++++++++++++++++++++++++++++----- > server/protocol.def | 10 ++++++ > 2 files changed, 86 insertions(+), 8 deletions(-) > > diff --git a/server/async.c b/server/async.c > index 6373e8c1ae4..714e82362c6 100644 > --- a/server/async.c > +++ b/server/async.c > @@ -473,6 +473,17 @@ static void add_async_completion( struct async *async, apc_param_t cvalue, unsig > if (async->completion) add_completion( async->completion, async->comp_key, cvalue, status, information ); > } > > +static void async_dequeue( struct async *async ) > +{ > + if (!async->queue) return; > + > + list_remove( &async->queue_entry ); > + async_reselect( async ); > + async->fd = NULL; > + async->queue = NULL; > + release_object( async ); > +} > + > /* store the result of the client-side async callback */ > void async_set_result( struct object *obj, unsigned int status, apc_param_t total ) > { > @@ -531,14 +542,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota > async->completion_callback( async->completion_callback_private ); > async->completion_callback = NULL; > > - if (async->queue) > - { > - list_remove( &async->queue_entry ); > - async_reselect( async ); > - async->fd = NULL; > - async->queue = NULL; > - release_object( async ); > - } > + async_dequeue( async ); > } > } > > @@ -750,3 +754,67 @@ DECL_HANDLER(get_async_result) > } > set_error( iosb->status ); > } > + > +/* Notify direct completion of async and close the wait handle */ > +DECL_HANDLER(notify_async_direct_result) > +{ > + struct async *async = (struct async *)get_handle_obj( current->process, req->handle, 0, &async_ops ); > + > + if (!async) return; > + > + if (async->iosb && async->unknown_status && !async->pending && async->terminated) > + { > + /* Reactivate async. We call async_reselect() later. */ > + async->terminated = 0; > + > + /* Set result for async_handoff(). */ > + set_error( req->status ); > + async->iosb->result = req->information; > + > + /* The async_handoff() call prior to the current server request was > + * effectively a no-op since async->unknown_status is 1. Calling it > + * again with async->unknown_status = 0 will do the remaining steps. > + */ > + async->unknown_status = 0; > + async_handoff( async, NULL, 0 ); > + > + if (get_error() == STATUS_PENDING) > + { > + async_reselect( async ); > + } > + else if (NT_ERROR( get_error() )) > + { > + /* synchronous I/O failure: don't invoke callbacks, only dequeue it. */ > + async_dequeue( async ); Note: we can't use async_set_result() here. async_handoff() leaves async->terminated as 0, and async_set_result() has "assert( async->terminated )". Thus, reusing async_set_result() here requires either: 1. Setting async->pending to 0 so that async_handoff() will call async_terminate(). This is obviously incorrect since unwanted IOCP packets and APCs will fire on synchronous failure. 2. Not using async_handoff(). We have to copy a lot of code (particulary setting pending and direct_result flags) out of async_handoff() to do this. > + } > + else > + { > + /* I/O completed successfully. The client has already set the IOSB, > + * so we can skip waiting on wait_handle and do async_set_result() > + * directly. > + * > + * If !async->direct_result, an APC_ASYNC_IO has been fired. > + * async_set_result() will be called when the APC returns. > + */ > + if (async->direct_result) > + { > + async_set_result( &async->obj, async->iosb->status, async->iosb->result ); > + async->direct_result = 0; > + } > + > + /* close wait handle here to avoid extra server round trip */ > + if (async->wait_handle) > + { > + close_handle( async->thread->process, async->wait_handle ); > + async->wait_handle = 0; > + } > + } > + > + /* The wait handle is preserved only when the status is STATUS_PENDING > + * and async->blocking is set (i.e. we're going to block on it). */ > + reply->handle = async->wait_handle; > + } > + else set_error( STATUS_ACCESS_DENIED ); > + > + release_object( &async->obj ); > +} > diff --git a/server/protocol.def b/server/protocol.def > index 02e73047f9b..2c3b8dbc619 100644 > --- a/server/protocol.def > +++ b/server/protocol.def > @@ -2163,6 +2163,16 @@ enum message_type > @END > > > +/* Notify direct completion of async and close the wait handle */ > +(a)REQ(notify_async_direct_result) > + obj_handle_t handle; /* wait handle */ > + unsigned int status; /* completion status */ > + apc_param_t information; /* IO_STATUS_BLOCK Information */ > +(a)REPLY > + obj_handle_t handle; /* wait handle, or NULL if closed */ > +(a)END > + > + > /* Perform a read on a file object */ > @REQ(read) > async_data_t async; /* async I/O parameters */ > -- Sincerely, Jinoh Kang

Jan. 27, 2022