[PATCH 01/24] dxva2/tests: Avoid "misleading indentation" warnings.
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
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
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
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
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
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
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
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
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=106234 Your paranoid android. === w10pro64_ar (64 bit report) === kernel32: loader.c:720: Test failed: 1219: wrong status c000011b/c0000130 loader.c:720: Test failed: 1224: wrong status c000011b/c000007b loader.c:720: Test failed: 1229: wrong status c000011b/c000007b loader.c:720: Test failed: 1234: wrong status c000011b/c000007b loader.c:720: Test failed: 1239: wrong status c000011b/c000007b loader.c:720: Test failed: 1244: wrong status c000011b/c000007b loader.c:720: Test failed: 1260: wrong status c000011b/0 loader.c:720: Test failed: 1264: wrong status c000011b/0 loader.c:720: Test failed: 1269: wrong status c000011b/0 loader.c:720: Test failed: 1273: wrong status c000011b/0 loader.c:720: Test failed: 1277: wrong status c000011b/0 loader.c:720: Test failed: 1431: wrong status c000011b/c000007b loader.c:720: Test failed: 1439: wrong status c000011b/c000007b loader.c:720: Test failed: 1444: wrong status c000011b/0 loader.c:724: Test failed: 1444: failed with c000011b expected fallback loader.c:720: Test failed: 1450: wrong status c000011b/0 loader.c:724: Test failed: 1450: failed with c000011b expected fallback loader.c:720: Test failed: 1456: wrong status c000011b/0 loader.c:724: Test failed: 1456: failed with c000011b expected fallback loader.c:720: Test failed: 1463: wrong status c000011b/0 loader.c:724: Test failed: 1463: failed with c000011b expected fallback loader.c:720: Test failed: 1469: wrong status c000011b/0 loader.c:720: Test failed: 1478: wrong status c000011b/0 loader.c:720: Test failed: 1482: wrong status c000011b/0 loader.c:720: Test failed: 1486: wrong status c000011b/0 loader.c:720: Test failed: 1490: wrong status c000011b/0 loader.c:720: Test failed: 1494: wrong status c000011b/0 === w10pro64_he (64 bit report) === kernel32: loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c0000130 loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1197: wrong status c0000131/c000011b loader.c:720: Test failed: 1214: wrong status c0000131/c0000130 loader.c:720: Test failed: 1219: wrong status c0000131/c0000130 loader.c:720: Test failed: 1224: wrong status c0000131/c000007b loader.c:720: Test failed: 1229: wrong status c0000131/c000007b loader.c:720: Test failed: 1234: wrong status c0000131/c000007b loader.c:720: Test failed: 1239: wrong status c0000131/c000007b loader.c:720: Test failed: 1244: wrong status c0000131/c000007b loader.c:720: Test failed: 1260: wrong status c0000131/0 loader.c:720: Test failed: 1264: wrong status c0000131/0 loader.c:720: Test failed: 1269: wrong status c0000131/0 loader.c:720: Test failed: 1273: wrong status c0000131/0 loader.c:720: Test failed: 1277: wrong status c0000131/0 loader.c:720: Test failed: 1431: wrong status c0000131/c000007b loader.c:720: Test failed: 1439: wrong status c0000131/c000007b loader.c:720: Test failed: 1444: wrong status c0000131/0 loader.c:724: Test failed: 1444: failed with c0000131 expected fallback loader.c:720: Test failed: 1450: wrong status c0000131/0 loader.c:724: Test failed: 1450: failed with c0000131 expected fallback loader.c:720: Test failed: 1456: wrong status c0000131/0 loader.c:724: Test failed: 1456: failed with c0000131 expected fallback loader.c:720: Test failed: 1463: wrong status c0000131/0 loader.c:724: Test failed: 1463: failed with c0000131 expected fallback loader.c:720: Test failed: 1469: wrong status c0000131/0 loader.c:720: Test failed: 1478: wrong status c0000131/0 loader.c:720: Test failed: 1482: wrong status c0000131/0 loader.c:720: Test failed: 1486: wrong status c0000131/0 loader.c:720: Test failed: 1490: wrong status c0000131/0 loader.c:720: Test failed: 1494: wrong status c0000131/0 === w10pro64_zh_CN (64 bit report) === kernel32: loader.c:720: Test failed: 1219: wrong status c000011b/c0000130 loader.c:720: Test failed: 1224: wrong status c000011b/c000007b loader.c:720: Test failed: 1229: wrong status c000011b/c000007b loader.c:720: Test failed: 1234: wrong status c000011b/c000007b loader.c:720: Test failed: 1239: wrong status c000011b/c000007b loader.c:720: Test failed: 1244: wrong status c000011b/c000007b loader.c:720: Test failed: 1260: wrong status c000011b/0 loader.c:720: Test failed: 1264: wrong status c000011b/0 loader.c:720: Test failed: 1269: wrong status c000011b/0 loader.c:720: Test failed: 1273: wrong status c000011b/0 loader.c:720: Test failed: 1277: wrong status c000011b/0 loader.c:720: Test failed: 1431: wrong status c000011b/c000007b loader.c:720: Test failed: 1439: wrong status c000011b/c000007b loader.c:720: Test failed: 1444: wrong status c000011b/0 loader.c:724: Test failed: 1444: failed with c000011b expected fallback loader.c:720: Test failed: 1450: wrong status c000011b/0 loader.c:724: Test failed: 1450: failed with c000011b expected fallback loader.c:720: Test failed: 1456: wrong status c000011b/0 loader.c:724: Test failed: 1456: failed with c000011b expected fallback loader.c:720: Test failed: 1463: wrong status c000011b/0 loader.c:724: Test failed: 1463: failed with c000011b expected fallback loader.c:720: Test failed: 1469: wrong status c000011b/0 loader.c:720: Test failed: 1478: wrong status c000011b/0 loader.c:720: Test failed: 1482: wrong status c000011b/0 loader.c:720: Test failed: 1486: wrong status c000011b/0 loader.c:720: Test failed: 1490: wrong status c000011b/0 loader.c:720: Test failed: 1494: wrong status c000011b/0
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
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
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
I sent some fixes that remove all remaining todos, so this patch is no longer needed.
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
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mfplay/tests/mfplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 1daaa3af1d5..727ab1e3b9a 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,7 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +316,7 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +356,7 @@ todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player); -- 2.35.0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mlang/tests/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1486a643604..fd0611c72ac 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2256,7 +2256,7 @@ static void test_IMLangConvertCharset(IMultiLanguage *ml) HRESULT hr; hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); -todo_wine + todo_wine ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL); -- 2.35.0
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=106262 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msacm32/tests/msacm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 82ddb430cd7..4e31256e3cd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -952,7 +952,7 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -980,7 +980,7 @@ todo_wine ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1029,9 +1029,9 @@ todo_wine mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); -todo_wine + todo_wine ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1129,7 +1129,7 @@ static void test_convert(void) ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); -todo_wine_if(expected_output[i].todo) + todo_wine_if(expected_output[i].todo) ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i); mmr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1503,7 +1503,7 @@ static void test_acmDriverAdd(void) res = acmDriverAddA(&drvid, GetModuleHandleA(NULL), (LPARAM)acm_driver_func, 0, ACM_DRIVERADDF_FUNCTION); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 1, "Expected 1, got %d\n", driver_calls.driver.details); @@ -1514,10 +1514,10 @@ todo_wine acm.drv_details.cbStruct = sizeof(acm.drv_details); res = acmDriverDetailsA(drvid, &acm.drv_details, 0); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 2, "Expected 2, got %d\n", driver_calls.driver.details); -todo_wine + todo_wine ok(driver_calls.driver.close == 0, "Expected 0, got %d\n", driver_calls.driver.close); } -- 2.35.0
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=106263 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Jan 27, 2022 at 08:16:07PM +0100, Fabian Maurer wrote:
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msacm32/tests/msacm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 82ddb430cd7..4e31256e3cd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -952,7 +952,7 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -980,7 +980,7 @@ todo_wine ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1029,9 +1029,9 @@ todo_wine mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); -todo_wine + todo_wine ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1129,7 +1129,7 @@ static void test_convert(void) ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); -todo_wine_if(expected_output[i].todo) + todo_wine_if(expected_output[i].todo) ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i);
mmr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1503,7 +1503,7 @@ static void test_acmDriverAdd(void)
res = acmDriverAddA(&drvid, GetModuleHandleA(NULL), (LPARAM)acm_driver_func, 0, ACM_DRIVERADDF_FUNCTION); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 1, "Expected 1, got %d\n", driver_calls.driver.details);
@@ -1514,10 +1514,10 @@ todo_wine acm.drv_details.cbStruct = sizeof(acm.drv_details); res = acmDriverDetailsA(drvid, &acm.drv_details, 0); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 2, "Expected 2, got %d\n", driver_calls.driver.details); -todo_wine + todo_wine ok(driver_calls.driver.close == 0, "Expected 0, got %d\n", driver_calls.driver.close); }
-- 2.35.0
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/db.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db132fbd2f..52ac63dc61b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2782,7 +2782,7 @@ static void test_register_product(void) } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2887,7 +2887,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2999,7 +2999,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); - todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 447f2cdd0ee..b75e5f7a4b5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8864,7 +8864,7 @@ static void test_viewmodify_merge(void) MsiRecordSetInteger(rec, 1, 1); MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 2); @@ -8913,7 +8913,7 @@ todo_wine MsiRecordSetInteger(rec, 3, 4); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 2, 4); @@ -8958,7 +8958,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiCloseHandle(rec); @@ -8998,7 +8998,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 2); MsiRecordSetInteger(rec, 3, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 1); -- 2.35.0
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=106264 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 Task: Patch failed to apply
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msscript.ocx/tests/msscript.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 756c21d887b..897bcec3262 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1453,10 +1453,10 @@ static void test_Language(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); hr = IScriptControl_get_Language(sc, &str); - todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); + if (hr == S_OK) + ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); IActiveScriptSite_Release(site); @@ -2437,7 +2437,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, BOOL todo, int line) error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); -todo_wine_if(todo == TRUE) + todo_wine_if(todo == TRUE) ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); -- 2.35.0
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=106265 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 21d513c0fd9..43ffb277ed4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -3586,8 +3586,8 @@ static void test_ostream(void) { ret = (int) call_func1(p_ostream_opfx, &os1); ok(ret == 1, "expected 1 got %d\n", ret); os1.base_ios.sb = NULL; -if (0) /* crashes on native */ - call_func1(p_ostream_osfx, &os1); + if (0) /* crashes on native */ + call_func1(p_ostream_osfx, &os1); os1.base_ios.sb = &fb1.base; os1.base_ios.flags = FLAGS_unitbuf; call_func1(p_ostream_osfx, &os1); -- 2.35.0
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=106266 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 Task: Patch failed to apply
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvfw32/tests/msvfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index def78f02e9d..07ff7e3694c 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -477,7 +477,7 @@ static void test_ICInfo(void) ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ -todo_wine + todo_wine ok(!ICInfo(test_type, 0, &info), "Expected failure.\n"); ret = ICRemove(test_type, test_handler, 0); @@ -505,7 +505,7 @@ todo_wine ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ -todo_wine + todo_wine ok(!ICInfo(test_type, 0, &info), "Expected failure.\n"); ret = WritePrivateProfileStringA("drivers32", "wine.test", NULL, "system.ini"); -- 2.35.0
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=106267 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msxml3/tests/domdoc.c | 26 +++++++++++++------------- dlls/msxml3/tests/httpreq.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e931c683fb8..193f169788d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7487,7 +7487,7 @@ static void test_XSLPattern(void) if (len) { if (ptr->todo) { char *str = list_to_string(list); - todo_wine + todo_wine ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); IXMLDOMNodeList_Release(list); } @@ -8685,7 +8685,7 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_get_xml(doc, &xml); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); SysFreeString(xml); @@ -10898,7 +10898,7 @@ static void test_mxnamespacemanager(void) EXPECT_REF(mgr2, 2); prefixes = NULL; hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { @@ -11469,7 +11469,7 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11484,7 +11484,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11537,7 +11537,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); IXMLDOMNodeList_Release(node_list); @@ -11563,7 +11563,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); IDispatchEx_Release(dispex); @@ -11668,7 +11668,7 @@ todo_wine { V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -11708,7 +11708,7 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); @@ -13259,7 +13259,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IResponse); -todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) + todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; @@ -13689,15 +13689,15 @@ static void test_load_with_site(void) hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); ok(hr == S_OK, "got %#x\n", hr); ok(qi_count != 0, "got %d QI calls\n", qi_count); -todo_wine + todo_wine ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 2491e499638..9368ab3c93c 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1401,11 +1401,11 @@ static void set_xhr_site(IXMLHttpRequest *xhr) EXPECT_HR(hr, S_OK); CHECK_CALLED(site_qi_IServiceProvider); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 20c5e07443b..ef3818f6f2c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4504,7 +4504,7 @@ static void test_mxwriter_domdoc(void) V_DISPATCH(&dest) = (IDispatch *)domdoc; hr = IMXWriter_put_output(writer, dest); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); if (FAILED(hr)) { @@ -4530,11 +4530,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_get_documentElement(domdoc, &root); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); /* startElement allows document root node to be accessed. */ @@ -4547,7 +4547,7 @@ todo_wine hr = IXMLDOMElement_get_nodeName(root, &str); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -4560,11 +4560,11 @@ todo_wine hr = IXMLDOMNodeList_get_length(node_list, &list_length); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(list_length == 1, "list length %i, expected 1\n", list_length); hr = IXMLDOMNodeList_get_item(node_list, 0, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str); @@ -4618,7 +4618,7 @@ todo_wine { ok(2 == list_length, "list length %i, expected 2\n", list_length); } hr = IXMLDOMNodeList_get_item(node_list, 1, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str); -- 2.35.0
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=106268 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/nsi/tests/nsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index a9f8ba3ae6e..fc85d4ba8ff 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -631,7 +631,7 @@ static void test_ip_neighbour( int family ) err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl, key_size, (void **)&rw_tbl, sizeof(*rw), (void **)&dyn_tbl, sizeof(*dyn), NULL, 0, &count, 0 ); -todo_wine_if( family == AF_INET6 ) + todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err; -- 2.35.0
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=106269 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/tests/file.c | 38 +++++++++++++++++++------------------- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/reg.c | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2ac21..760e2ff167e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1113,7 +1113,7 @@ static void test_file_io_completion(void) U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#x\n", res ); -todo_wine + todo_wine ok( U(iosb).Status == 0xdeadbeef, "wrong status %#x\n", U(iosb).Status ); CloseHandle( client ); CloseHandle( server ); @@ -3020,20 +3020,20 @@ static void test_file_disposition_information(void) res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3153,12 +3153,12 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3202,13 +3202,13 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); @@ -3227,20 +3227,20 @@ todo_wine res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -4231,7 +4231,7 @@ static void test_NtCreateFile(void) /* FIXME: leave only 'else' case below once Wine is fixed */ if (ret != td[i].attrib_out) { - todo_wine + todo_wine ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); SetFileAttributesW(path, td[i].attrib_out); } diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5bcccd8a322..e9d42127c3e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2251,7 +2251,7 @@ static void test_query_process_image_file_name(void) buffer = heap_alloc(ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -todo_wine + todo_wine ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)), "Expected image name to begin with \\Device\\, got %s\n", wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR))); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..bd8d531edf0 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,9 +374,9 @@ static void test_NtOpenKey(void) attr.Length = sizeof(attr); key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, 0, &attr); -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); @@ -386,7 +386,7 @@ todo_wine key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str ); -- 2.35.0
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=106270 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8cb97507ab5..0364fecab1d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -280,7 +280,7 @@ static void test_mdl_map(void) MmProbeAndLockPages(mdl, KernelMode, IoReadAccess); addr = MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, NormalPagePriority); -todo_wine + todo_wine ok(addr != NULL, "MmMapLockedPagesSpecifyCache failed\n"); MmUnmapLockedPages(addr, mdl); -- 2.35.0
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=106271 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply
Not sure why the patches fail, it works for me. Is there something I need to change here? Regards, Fabian Maurer On Freitag, 28. Januar 2022 03:36:52 CET you wrote:
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=106271
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply
participants (8)
-
Andrew Eikum -
Esme Povirk (she/they) -
Fabian Maurer -
Hans Leidekker -
Huw Davies -
Marvin -
Nikolay Sivov -
Piotr Caban