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

Re: [PATCH v4 1/4] wdscore: Implement CurrentIP.

by Mohamad Al-Jaf

Hi Giovanni, I see, thanks for the clarification. Yes, the patch solves the bug. Well, for the tests removing WINAPI seems to change the pointer a bit, but it's still within the range so it doesn't seem to affect it. I haven't tried it with __ASM_GLOBAL_FUNC, but it seems to work fine as is. Along with the stubs in this patchset, wdscore functions similarly to the native version, at least for the media creation tool. Still, I'm just wondering if using __ASM_STDCALL_FUNC isn't accurate? In the CallCbsCore headers, CurrentIP is defined without WINAPI.[1] I don't know what to do now. If it's okay to use WINAPI, should I resubmit the older version of this patch? [1] https://github.com/seven-mile/CallCbsCore/blob/master/StackManager.h

Jan. 29, 2022

Re: [PATCH 06/22] schedsvc/tests: Avoid "misleading indentation" warnings.

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=106394 Your paranoid android. === w7u_adm (32 bit report) === schedsvc: rpcapi.c:245: Test failed: expected NULL, got 0059AC78 rpcapi.c:257: Test failed: expected NULL, got 0059AC98 rpcapi.c:357: Test failed: expected NULL, got 0059ACB8

Jan. 29, 2022

Re: [PATCH 02/22] psapi/tests: Avoid "misleading indentation" warnings.

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=106390 Your paranoid android. === w10pro64_ja (64 bit report) === psapi: psapi_main.c:778: Test failed: exe expected Valid=1 but got 0 psapi_main.c:782: Test failed: exe expected Win32Protection=2 but got 0

Jan. 29, 2022

Wine staging 7.1 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.1 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [49412] ws2_32: Support WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY * [49678] xactengine: Implement callback notifications. * [44514] wined3d: Use bindless textures for GLSL shaders. Updated: * nvcuda-CUDA_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Jan. 28, 2022

[PATCH 22/22] xmllite/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/xmllite/tests/reader.c | 12 ++++++------ dlls/xmllite/tests/writer.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cb3a3f4e571..c4e53a5c40c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -797,16 +797,16 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); @@ -1006,11 +1006,11 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine + todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -1556,7 +1556,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ -todo_wine + todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 13d67becbe4..c69aa42598d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -434,7 +434,7 @@ static void test_writeroutput(void) unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); -todo_wine + todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); /* releasing 'unk' crashes on native */ @@ -1694,7 +1694,7 @@ static void test_WriteAttributeString(void) hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); - todo_wine_if(attribute_tests[i].todo_hr) + todo_wine_if(attribute_tests[i].todo_hr) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); @@ -1734,7 +1734,7 @@ static void test_WriteAttributeString(void) ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); -todo_wine + todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); hr = write_start_element(writer, NULL, "b", NULL); -- 2.35.0

Jan. 28, 2022

[PATCH 21/22] ws2_32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ws2_32/tests/protocol.c | 48 ++++++++++++++++++------------------ dlls/ws2_32/tests/sock.c | 26 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 881e3a388fd..5597e3df854 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -393,13 +393,13 @@ static void test_WSALookupService(void) ret = WSALookupServiceBeginW(NULL, 0, &handle); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, NULL); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &handle); @@ -410,9 +410,9 @@ todo_wine ret = WSALookupServiceEnd(NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); -todo_wine + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); /* standard network list query */ @@ -426,9 +426,9 @@ todo_wine return; } -todo_wine + todo_wine ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); -todo_wine + todo_wine ok(handle != (HANDLE)0xdeadbeef, "Handle was not filled\n"); offset = 0; @@ -2610,40 +2610,40 @@ static void test_WSAEnumNameSpaceProvidersA(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersA(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); HeapFree(GetProcessHeap(), 0, name); @@ -2657,40 +2657,40 @@ static void test_WSAEnumNameSpaceProvidersW(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersW(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); if (winetest_debug > 1) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 054e597b719..b38357954b7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,7 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine + todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1300,7 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + todo_wine ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ @@ -6054,7 +6054,7 @@ todo_wine { ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); err = WSAGetLastError(); -todo_wine + todo_wine ok(err == WSAEINVAL, "expected 10014, got %d instead\n", err); closesocket(sock); } @@ -7184,7 +7184,7 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); -todo_wine + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); @@ -8768,7 +8768,7 @@ static void test_sioAddressListChange(void) ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); ret = WaitForSingleObject(event2, 500); -todo_wine + todo_wine ok(ret == WAIT_OBJECT_0, "failed to get change event %u\n", ret); ret = WaitForSingleObject(event3, 500); @@ -10329,7 +10329,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10337,7 +10337,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -10568,7 +10568,7 @@ static void iocp_async_read_thread_closesocket(SOCKET src) SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10576,7 +10576,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -11724,10 +11724,10 @@ static void do_sockopt_validity_tests(const char *type, SOCKET sock, int level, WSASetLastError(0); rc = getsockopt(sock, level, tests[i].opt, value, &count); expected_rc = tests[i].get_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].get_error && tests[i].todo) + todo_wine_if(!tests[i].get_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].get_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to set error %i, got %i\n", tests[i].get_error, WSAGetLastError()); @@ -11740,10 +11740,10 @@ todo_wine_if(tests[i].todo) WSASetLastError(0); rc = setsockopt(sock, level, tests[i].opt, value, count); expected_rc = tests[i].set_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].set_error && tests[i].todo) + todo_wine_if(!tests[i].set_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].set_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to set error %i, got %i\n", tests[i].set_error, WSAGetLastError()); -- 2.35.0

Jan. 28, 2022

[PATCH 20/22] wininet/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wininet/tests/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4c2facb635a..8fc72be8431 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1632,7 +1632,7 @@ static void test_InternetGetConnectedStateExA(void) buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); @@ -1734,7 +1734,7 @@ static void test_InternetGetConnectedStateExW(void) buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); -- 2.35.0

Jan. 28, 2022

[PATCH 19/22] winhttp/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7e46a43aa05..053f8315fec 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4816,7 +4816,7 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&arg[2]); params.cArgs = 3; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); VariantInit(&arg[0]); @@ -4861,7 +4861,7 @@ todo_wine params.cArgs = 2; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); params.cArgs = 0; -- 2.35.0

Jan. 28, 2022

[PATCH 18/22] windowscodecs/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/windowscodecs/tests/bitmap.c | 4 ++-- dlls/windowscodecs/tests/converter.c | 2 +- dlls/windowscodecs/tests/icoformat.c | 2 +- dlls/windowscodecs/tests/info.c | 22 +++++++++++----------- dlls/windowscodecs/tests/pngformat.c | 4 ++-- dlls/windowscodecs/tests/stream.c | 2 +- dlls/windowscodecs/tests/tiffformat.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index dd31bf88f3f..2dfe3f93f6b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -867,7 +867,7 @@ static void test_CreateBitmapFromHBITMAP(void) ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); -todo_wine + todo_wine ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format %s\n", wine_dbgstr_guid(&format)); @@ -887,7 +887,7 @@ todo_wine hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); -todo_wine + todo_wine ok(count == 16, "expected 16, got %u\n", count); IWICPalette_Release(palette); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0429b7a3af6..f0672fceaf8 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1223,7 +1223,7 @@ static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 38db51c3764..36cc970bf3c 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -164,7 +164,7 @@ static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int tod { hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, WICDecodeMetadataCacheOnDemand); - todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index bb8d3310bc9..339555f23fe 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -177,7 +177,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); @@ -186,7 +186,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); value[0] = 0; @@ -198,7 +198,7 @@ static void test_decoder_info(void) } hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); @@ -250,7 +250,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); @@ -258,27 +258,27 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); value[0] = 0; hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); IWICBitmapDecoderInfo_Release(decoder_info); @@ -559,7 +559,7 @@ static void test_reader_info(void) IWICComponentInfo_Release(info); hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info); -todo_wine + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); if (FAILED(hr)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 32afc989c2b..50cb7a68a87 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -824,7 +824,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "PLTE+tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); @@ -907,7 +907,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index d3f712c38b0..247606ebf58 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -32,7 +32,7 @@ static void _check_cur_pos(IStream *stream, ULONGLONG expected_pos, BOOL todo, u offset.QuadPart = 0; hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &pos); ok_(__FILE__, line)(hr == S_OK, "Failed to get current position, hr %#x.\n", hr); -todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(pos.QuadPart == expected_pos, "Unexpected stream position %s.\n", wine_dbgstr_longlong(pos.QuadPart)); } diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index e0d70929585..4c3dea2288f 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -551,7 +551,7 @@ static void test_QueryCapability(void) /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); if (SUCCEEDED(hr)) -- 2.35.0

Jan. 28, 2022

[PATCH 17/22] wiaservc/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wiaservc/tests/wia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index 6183cefc61d..48050f4ecc9 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -49,7 +49,7 @@ static void test_EnumDeviceInfo(void) count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count != 1000, "got %u\n", count); @@ -61,11 +61,11 @@ static void test_SelectDeviceDlg(void) HRESULT hr; IWiaItem *root; hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); -todo_wine + todo_wine ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); } -- 2.35.0

Jan. 28, 2022