- Wine-Commits - list.winehq.org

Jeff Smith : gdiplus/tests: Add tests related to setting the page tranform.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 73aed1b531627e1ebaacfec3e11f186b99d9fa52 URL: https://gitlab.winehq.org/wine/wine/-/commit/73aed1b531627e1ebaacfec3e11f18… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:11:17 2023 -0500 gdiplus/tests: Add tests related to setting the page tranform. --- dlls/gdiplus/tests/graphics.c | 97 +++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 98 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 89baff64fa4..40b624df1ba 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1828,6 +1828,9 @@ static void test_Get_Release_DC(void) /* GdipMeasureString */ status = GdipResetClip(graphics); expect(ObjectBusy, status); + status = GdipResetPageTransform(graphics); + todo_wine + expect(ObjectBusy, status); status = GdipResetWorldTransform(graphics); expect(ObjectBusy, status); /* GdipRestoreGraphics */ @@ -1844,6 +1847,9 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = GdipSetPageScale(graphics, 1.0); expect(ObjectBusy, status); + status = GdipSetPageScale(graphics, 0.0); + todo_wine + expect(ObjectBusy, status); status = GdipSetPageUnit(graphics, UnitWorld); expect(ObjectBusy, status); status = GdipSetPixelOffsetMode(graphics, PixelOffsetModeDefault); @@ -4058,6 +4064,96 @@ static void test_transform(void) } } +static void test_set_page_transform(void) +{ + static const struct + { + GpUnit unit; + BOOL isInvalid; + } td_unit[] = + { + {UnitWorld, TRUE}, + {UnitDisplay}, + {UnitPixel}, + {UnitPoint}, + {UnitInch}, + {UnitDocument}, + {UnitMillimeter}, + {UnitMillimeter + 1, TRUE}, + }; + static const struct { + REAL scale; + BOOL isInvalid; + } td_scale[] = + { + {-1.0, TRUE}, + {0.0, TRUE}, + {0.5}, + {1.0}, + {2.0}, + }; + GpStatus status; + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpUnit unit; + REAL scale; + UINT i; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + for (i = 0; i < ARRAY_SIZE(td_unit); i++) + { + winetest_push_context("%u", i); + status = GdipSetPageUnit(graphics, td_unit[i].unit); + todo_wine_if(td_unit[i].unit > UnitMillimeter) + expect(td_unit[i].isInvalid ? InvalidParameter : Ok, status); + if (status == Ok) + { + status = GdipGetPageUnit(graphics, &unit); + expect(Ok, status); + expect(td_unit[i].unit, unit); + } + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(td_scale); i++) + { + winetest_push_context("%u", i); + status = GdipSetPageScale(graphics, td_scale[i].scale); + expect(td_scale[i].isInvalid ? InvalidParameter : Ok, status); + if (status == Ok) + { + status = GdipGetPageScale(graphics, &scale); + expect(Ok, status); + expectf_(td_scale[i].scale, scale, 0); + } + winetest_pop_context(); + } + + status = GdipGetPageUnit(graphics, &unit); + expect(Ok, status); + todo_wine + expect(UnitMillimeter, unit); + status = GdipGetPageScale(graphics, &scale); + expect(Ok, status); + expectf_(2.0, scale, 0); + status = GdipResetPageTransform(graphics); + todo_wine + expect(Ok, status); + status = GdipGetPageUnit(graphics, &unit); + expect(Ok, status); + todo_wine + expect(UnitDisplay, unit); + status = GdipGetPageScale(graphics, &scale); + expect(Ok, status); + todo_wine + expectf_(1.0, scale, 0); + + GdipDeleteGraphics(graphics); + ReleaseDC(hwnd, hdc); +} + static void test_pen_thickness(void) { static const struct test_data @@ -7275,6 +7371,7 @@ START_TEST(graphics) test_measure_string(); test_font_height_scaling(); test_transform(); + test_set_page_transform(); test_pen_thickness(); test_GdipMeasureString(); test_constructor_destructor(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 10f4d435a85..8950ab3258b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -290,6 +290,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); +GpStatus WINGDIPAPI GdipResetPageTransform(GpGraphics*); GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder);

1 0

Jeff Smith : gdiplus: Implement GdipResetPageTransform.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 142dc48aaea0539c0c4bda82c72eb907c729ac4a URL: https://gitlab.winehq.org/wine/wine/-/commit/142dc48aaea0539c0c4bda82c72eb9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:15:07 2023 -0500 gdiplus: Implement GdipResetPageTransform. --- dlls/gdiplus/graphics.c | 23 ++++++++++++++++++----- dlls/gdiplus/tests/graphics.c | 4 ---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58b2de213a6..32c45458c8f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7536,14 +7536,27 @@ cleanup: GpStatus WINGDIPAPI GdipResetPageTransform(GpGraphics *graphics) { - static int calls; + GpStatus stat; - TRACE("(%p) stub\n", graphics); + TRACE("(%p)\n", graphics); - if(!(calls++)) - FIXME("not implemented\n"); + if(!graphics) + return InvalidParameter; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + if (is_metafile_graphics(graphics)) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, UnitDisplay, 1.0); + if (stat != Ok) + return stat; + } + + graphics->scale = 1.0; + graphics->unit = UnitDisplay; + + return Ok; } GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics *graphics, GdiplusAbort *pabort) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 40b624df1ba..784a88d9a70 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1829,7 +1829,6 @@ static void test_Get_Release_DC(void) status = GdipResetClip(graphics); expect(ObjectBusy, status); status = GdipResetPageTransform(graphics); - todo_wine expect(ObjectBusy, status); status = GdipResetWorldTransform(graphics); expect(ObjectBusy, status); @@ -4139,15 +4138,12 @@ static void test_set_page_transform(void) expect(Ok, status); expectf_(2.0, scale, 0); status = GdipResetPageTransform(graphics); - todo_wine expect(Ok, status); status = GdipGetPageUnit(graphics, &unit); expect(Ok, status); - todo_wine expect(UnitDisplay, unit); status = GdipGetPageScale(graphics, &scale); expect(Ok, status); - todo_wine expectf_(1.0, scale, 0); GdipDeleteGraphics(graphics);

1 0

Zebediah Figura : ntdll: Do not reject data directories at the end of a file.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 229ccfd04829b63c9da694303b48d4153cac45db URL: https://gitlab.winehq.org/wine/wine/-/commit/229ccfd04829b63c9da694303b48d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 10:46:22 2023 -0500 ntdll: Do not reject data directories at the end of a file. Found when wpfgfx_cor3.dll failed to relocate in Bentley CONNECTION Client. Fixes: 56d9e1a8a8dcce492587b2d26889a3072f4d2e2c. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 24de360d983..2c2000751e5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2612,7 +2612,7 @@ static IMAGE_DATA_DIRECTORY *get_data_dir( IMAGE_NT_HEADERS *nt, SIZE_T total_si if (!data->Size) return NULL; if (!data->VirtualAddress) return NULL; if (data->VirtualAddress >= total_size) return NULL; - if (data->Size >= total_size - data->VirtualAddress) return NULL; + if (data->Size > total_size - data->VirtualAddress) return NULL; return data; }

1 0

Rémi Bernon : dmime: Remove shadowing local hr variable.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: f65cf1ed6d711445befcc6596e3ce374c77394d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f65cf1ed6d711445befcc6596e3ce3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:38:43 2023 +0200 dmime: Remove shadowing local hr variable. --- dlls/dmime/segment.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 5f409b3cb5a..126bc44335d 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -816,7 +816,6 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')): { IDirectMusicTrack8 *track; - HRESULT hr; TRACE("Loading segment %p from wave file\n", This);

1 0

Rémi Bernon : dmime: Skip sequence track chunk on parsing failure.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 7b66268fabc1da6f1c81c4aa18be5cffc4e516e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b66268fabc1da6f1c81c4aa18be5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:37:40 2023 +0200 dmime: Skip sequence track chunk on parsing failure. --- dlls/dmime/seqtrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index a6043cb4a89..b532fc48ca6 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -404,6 +404,7 @@ static HRESULT WINAPI track_IPersistStream_Load(IPersistStream *iface, IStream * } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr; if (TRACE_ON(dmime)) @@ -446,7 +447,6 @@ static HRESULT WINAPI track_IPersistStream_Load(IPersistStream *iface, IStream * } } - stream_skip_chunk(stream, &chunk); return S_OK; }

1 0

Rémi Bernon : dmime: Ignore badly formed wave if format and data have been found.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 17416be982c73f4ba9e99b718db56759ee3c7512 URL: https://gitlab.winehq.org/wine/wine/-/commit/17416be982c73f4ba9e99b718db567… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:38:06 2023 +0200 dmime: Ignore badly formed wave if format and data have been found. --- dlls/dmusic/wave.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index dd0b8a44779..8ee713bd4f0 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -167,6 +167,7 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk if (FAILED(hr)) break; } + if (This->format && This->data) return S_OK; return hr; }

1 0

Rémi Bernon : dmime: Skip segment chunk on parsing failure (or success).
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: bff73016993f8c9439b88fb158ad801ce5ef15d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bff73016993f8c9439b88fb158ad80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:39:03 2023 +0200 dmime: Skip segment chunk on parsing failure (or success). --- dlls/dmime/segment.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d7402911f00..5f409b3cb5a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -833,6 +833,7 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) { WARN("Failed to load segment from stream %p, hr %#lx\n", stream, hr);

1 0

Rémi Bernon : dmusic: Ignore some known wave chunks.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 347fb8bc8e8005ccb397995426f8d12c0c941b8d URL: https://gitlab.winehq.org/wine/wine/-/commit/347fb8bc8e8005ccb397995426f8d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 08:56:18 2023 +0200 dmusic: Ignore some known wave chunks. --- dlls/dmusic/wave.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index 8ee713bd4f0..27f7224af49 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -159,6 +159,11 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk hr = parse_wsmp_chunk(This, stream, &chunk); break; + case mmioFOURCC('w','a','v','u'): + case mmioFOURCC('s','m','p','l'): + case MAKE_IDTYPE(FOURCC_LIST, DMUS_FOURCC_INFO_LIST): + break; + default: FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); break;

1 0

Rémi Bernon : dmband: Skip band / band track chunk on parsing failure.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: f5c8d273b68517b86b49db17d9ce12d3958b7fae URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c8d273b68517b86b49db17d9ce12… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:36:33 2023 +0200 dmband: Skip band / band track chunk on parsing failure. --- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4c593741516..78ec68ae035 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -422,6 +422,7 @@ static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *s } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr; if (TRACE_ON(dmband)) @@ -439,7 +440,6 @@ static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *s } } - stream_skip_chunk(stream, &chunk); return S_OK; } diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 5229204b284..0ec14483c33 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -568,6 +568,7 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr; if (TRACE_ON(dmband)) @@ -590,7 +591,6 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr } } - stream_skip_chunk(stream, &chunk); return S_OK; }

1 0

Rémi Bernon : dmusic/tests: Skip test_default_gm_collection if gm.dls is missing.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: c8b9a2dcfdb7edde41d8cd0e6e3917a72ece9c99 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8b9a2dcfdb7edde41d8cd0e6e3917… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:57:25 2023 +0200 dmusic/tests: Skip test_default_gm_collection if gm.dls is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55688 --- dlls/dmusic/tests/dmusic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 51a6b0d8774..f71c0600366 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -1608,6 +1608,11 @@ static void test_default_gm_collection(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicCollection, (void **)&collection); + if (hr == DMUS_E_LOADER_NOFILENAME) + { + skip("Failed to open default GM collection, skipping tests. Missing system SoundFont?\n"); + goto skip_tests; + } ok(hr == S_OK, "got %#lx\n", hr); for (i = 0; hr == S_OK && i < ARRAY_SIZE(results); i++) @@ -1635,6 +1640,8 @@ static void test_default_gm_collection(void) } IDirectMusicCollection_Release(collection); + +skip_tests: IDirectMusicLoader_Release(loader); }

1 0