- Wine-Devel - list.winehq.org

[PATCH v3 4/6] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui July 13, 2020

July 13, 2020

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Change the position of EnterCriticalSection() to the beginning of DdsDecoder_Initialize(). dlls/windowscodecs/ddsformat.c | 118 ++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 3 - 2 files changed, 70 insertions(+), 51 deletions(-)

3 2

[PATCH v2] winegcc: Align sections in PE files to page size.
by Rémi Bernon July 13, 2020

July 13, 2020

This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Move code to PLATFORM_MINGW case. tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d3..274f93f40fd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -521,6 +521,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) + strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_addall( link_args, flags ); return link_args; -- 2.27.0

1 0

[PATCH] ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Myah Caron July 13, 2020

July 13, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/tests/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..02d54feec3 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, working = 0; i = 0; do @@ -253,6 +253,17 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + + if (t1 != t2) + working++; + } + + todo_wine ok(working >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", working); } START_TEST(time) -- 2.27.0

1 0

ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Myah Caron July 13, 2020

July 13, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/tests/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..02d54feec3 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, working = 0; i = 0; do @@ -253,6 +253,17 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + + if (t1 != t2) + working++; + } + + todo_wine ok(working >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", working); } START_TEST(time) -- 2.27.0

1 0

[PATCH] winegcc: Align sections in PE files to page size.
by Rémi Bernon July 13, 2020

July 13, 2020

This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm resending just this one as I am now trying to upstream PE support directly in Linux perf. This should still be useful to avoid copying sections when Wine modules are loaded. tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d3..24da839fd83 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -547,6 +547,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else if (!opts->strip) strarray_add(link_args, "-Wl,-debug:dwarf"); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment:0x1000")) + strarray_add( link_args, "-Wl,--file-alignment:0x1000" ); + strarray_addall( link_args, flags ); return link_args; -- 2.27.0

3 4

[PATCH 1/4] gdiplus/tests: Add metafile DrawDriverString test.
by Shawn M. Chapla July 13, 2020

July 13, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 141 ++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f3b817b3de..9e25da7561 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2953,6 +2953,146 @@ static void test_restoredc(void) expect(Ok, stat); } +static const emfplus_record drawdriverstring_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, + { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawdriverstring(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const PointF solidpos[4] = {{10.0,10.0}, {20.0,10.0}, {30.0,10.0}, {40.0,10.0}}; + static const PointF hatchpos = {10.0,30.0}; + + GpBitmap *bitmap; + GpStatus stat; + GpGraphics *graphics; + GpFont *solidfont, *hatchfont; + GpBrush *solidbrush, *hatchbrush; + HDC hdc; + GpMatrix *matrix; + GpMetafile *metafile; + ARGB color; + LOGFONTA logfont = { 0 }; + + hdc = CreateCompatibleDC(0); + + strcpy(logfont.lfFaceName, "Times New Roman"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + stat = GdipCreateFontFromLogfontA(hdc, &logfont, &solidfont); + if (stat == NotTrueTypeFont || stat == FileNotFound) + { + DeleteDC(hdc); + skip("Times New Roman not installed.\n"); + return; + } + + stat = GdipCloneFont(solidfont, &hatchfont); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, (ARGB)0xff00ff00, (ARGB)0xffff0000, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipCreateMatrix(&matrix); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, + DriverStringOptionsCmapLookup, matrix); + todo_wine expect(Ok, stat); + + stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); + todo_wine expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + + check_metafile(metafile, drawdriverstring_records, "drawdriverstring metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "drawdriverstring.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, drawdriverstring_records, "drawdriverstring playback", + dst_points, &frame, UnitPixel); + +/* The way we render glyphs differs slightly from native wrt. alpha + channel values around edges. Since verifying that glyphs are + rendered in a way that is pixel identical to native isn't really + the point of this test, simply perform a cursory check that + alpha channel values are non-zero. */ +#define fuzzy_expect(expected, got) \ + ok((got & ~0xff000000) == expected && (got & 0xff000000), \ + "Expected RGB 0x%.8x with any non-zero alpha value, got 0x%.8x\n", expected, got) + + GdipBitmapGetPixel(bitmap, 12, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 21, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 31, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 41, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 14, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 23, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 28, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 32, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + +#undef fuzzy_expect + + GdipDeleteMatrix(matrix); + GdipDeleteGraphics(graphics); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteFont(solidfont); + GdipDeleteFont(hatchfont); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3002,6 +3142,7 @@ START_TEST(metafile) test_drawpath(); test_fillpath(); test_restoredc(); + test_drawdriverstring(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

4 8

[PATCH v3 6/6] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui July 13, 2020

July 13, 2020

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH v3 5/6] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui July 13, 2020

July 13, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH 1/5] msdmo/tests: Add tests for DMOGetTypes().
by Zebediah Figura July 13, 2020

July 13, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/tests/msdmo.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 68de11f21ab..14653ea8d75 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -117,9 +117,59 @@ static void test_DMOEnum(void) IEnumDMO_Release(enum_dmo); } +static void test_DMOGetTypes(void) +{ + static const DMO_PARTIAL_MEDIATYPE input_types[] = + { + {{0x1111}, {0x2222}}, + {{0x1111}, {0x3333}}, + }; + ULONG input_count, output_count; + DMO_PARTIAL_MEDIATYPE types[3]; + HRESULT hr; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, + ARRAY_SIZE(input_types), input_types, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!input_count, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); test_DMOEnum(); + test_DMOGetTypes(); } -- 2.27.0

1 4

[RFC] Trying to fix desktop switches, cont.
by Rafał Mużyło July 13, 2020

July 13, 2020

So, after the previous post, I sat down and once again did some thinking/tinkering. Obviously, the previous patch couldn't work, at least not in the restoring part. This one seems to work (for now), though I've only did some very basic testing. It doesn't seem to be a way to add private data to a window, that would both be only accessible by wine and integrated with standard winapi calls. Correct me, if that's wrong. While WS_HIDDEN would seem better fitting, AFAICT it removes the window from event queues, so I went with WS_DISABLED. This time through standard functions.

4 9