January 2022 - Wine-commits

Nikolay Sivov : mf/tests: Remove remaining kernel32 heap calls.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ca1c586291feed4bc3f33cc6b95a67df47a51e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1c586291feed4bc3f33cc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:06:46 2022 +0300 mf/tests: Remove remaining kernel32 heap calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dede008fbd9..8ba93656a7d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1562,7 +1562,7 @@ static ULONG WINAPI test_source_Release(IMFMediaSource *iface) ULONG refcount = InterlockedDecrement(&source->refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, source); + free(source); return refcount; } @@ -1650,7 +1650,7 @@ static IMFMediaSource *create_test_source(void) { struct test_source *source; - source = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*source)); + source = calloc(1, sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1;

1 0

Nikolay Sivov : wshom: Fix long types warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 52b74b36bdf55510ef3990e3642945b493be7100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b74b36bdf55510ef3990e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:12:09 2022 +0300 wshom: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 1 - dlls/wshom.ocx/shell.c | 97 ++++++++++++++++++++------------------------- dlls/wshom.ocx/wshom_main.c | 6 +-- 3 files changed, 47 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52b74b36bdf55510ef39…

1 0

Fabian Maurer : wbemdisp/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: bcc03c96d553167504b01bad2fc885006f7a4730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc03c96d553167504b01bad… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:59 2022 +0100 wbemdisp/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index bf44f62329a..4ce847fac84 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -443,7 +443,7 @@ static void test_namedvalueset(void) V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value2, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); V_I4(&var) = 0; @@ -474,7 +474,7 @@ todo_wine { ok( count == 1, "Unexpected count %d.\n", count ); } hr = ISWbemNamedValueSet_DeleteAll( set ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 1; @@ -485,7 +485,7 @@ todo_wine { } V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 0;

1 0

Fabian Maurer : wbemprox/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c032eee8a8d0f729f7bf9b9b0b1451674fcf8592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c032eee8a8d0f729f7bf9b9b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:00 2022 +0100 wbemprox/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 2 +- dlls/wbemprox/tests/services.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 583ae578efa..a57a4398da3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,7 +1144,7 @@ static void test_query_semisync( IWbemServices *services ) count = 1; obj = (void *)0xdeadbeef; hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); -todo_wine + todo_wine ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); ok( count == 0, "Unexpected count %u.\n", count ); ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index f72d43c0b0b..651beaef6a2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -214,11 +214,11 @@ static void test_IWbemContext(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IWbemContext_Next(context, 0, &str, &var); -todo_wine + todo_wine ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); hr = IWbemContext_BeginEnumeration(context, 0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); str = NULL; @@ -229,7 +229,7 @@ todo_wine { SysFreeString(str); } hr = IWbemContext_EndEnumeration(context); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Overwrite */

1 0

Fabian Maurer : wiaservc/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 95bfc0fc03fff18fb8d261ef78e10d7721ec3d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95bfc0fc03fff18fb8d261ef… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:01 2022 +0100 wiaservc/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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); }

1 0

Fabian Maurer : windowscodecs/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c79cd9993b91edf3d38ab3ed9ae0e12e2860bbe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79cd9993b91edf3d38ab3ed… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:02 2022 +0100 windowscodecs/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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))

1 0

Fabian Maurer : winhttp/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 19c758dc56d3171854111908aacb70afe78eeda1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c758dc56d3171854111908… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:03 2022 +0100 winhttp/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Fabian Maurer : wininet/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 874473c50337a124d72fcb301095b4df76457293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=874473c50337a124d72fcb30… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:04 2022 +0100 wininet/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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");

1 0

Fabian Maurer : ws2_32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 0959b2acc7e1ea2a5cc7e3364bfc5fe2e04bc9b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0959b2acc7e1ea2a5cc7e336… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:05 2022 +0100 ws2_32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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());

1 0

Zebediah Figura : tiff: Explictly link to zlib.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ad5b6be1a9679b37ba5c3701f830648028727c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5b6be1a9679b37ba5c3701… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 18:53:50 2022 -0600 tiff: Explictly link to zlib. This normally works because the only module linking to tiff (windowscodecs) also pulls in static zlib via PNG_PE_LIBS. However, if using shared libpng, windowscodecs will currently fail to link. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 425d267ec50..8578764ed5e 100755 --- a/configure +++ b/configure @@ -13359,7 +13359,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 if ${TIFF_PE_LIBS:+false} : then : - TIFF_PE_LIBS=tiff + TIFF_PE_LIBS="tiff \$(ZLIB_PE_LIBS)" if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" diff --git a/configure.ac b/configure.ac index fed12f61036..54ef47f767c 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,7 +1102,7 @@ WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") -WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") +WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")

1 0