October 2023 - Wine-commits

Rémi Bernon : dmime: Force recompute MIDI message reference time.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 9ad97f69b4b25e439284925aca927d25a4c9dfde URL: https://gitlab.winehq.org/wine/wine/-/commit/9ad97f69b4b25e439284925aca927d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 22 15:51:05 2023 +0200 dmime: Force recompute MIDI message reference time. Fixes 65e388137c6117aaf8f99cef808d32afa29c7639, which is otherwise no-op without this change. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a2e611523a6..e0da0516c79 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1706,7 +1706,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, DMUS_NOTE_PMSG *note = (DMUS_NOTE_PMSG *)msg; msg->mtTime += note->nOffset; - if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, MIDI_NOTE_ON, note->bMidiValue, note->bVelocity))) WARN("Failed to translate message to MIDI, hr %#lx\n", hr);

1 0

Alistair Leslie-Hughes : msxml: Always increase error count when detected.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 60e8b78e4d232c09818b4a2b7977a3841df84338 URL: https://gitlab.winehq.org/wine/wine/-/commit/60e8b78e4d232c09818b4a2b7977a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 20 16:23:08 2023 +1100 msxml: Always increase error count when detected. The error count wasn't be increased if tracing was disabled. eg CI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55720 --- dlls/msxml3/xslpattern.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 9abf43cad35..b308c3150b0 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -40,6 +40,7 @@ static inline BOOL is_literal(xmlChar const* tok) static void xslpattern_error(parser_param* param, void const* scanner, char const* msg) { + param->err++; FIXME("%s:\n" " param {\n" " yyscanner=%p\n" @@ -52,7 +53,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons " }\n" " scanner=%p\n", msg, param->yyscanner, param->ctx, param->in, param->pos, - param->len, param->out, ++param->err, scanner); + param->len, param->out, param->err, scanner); } %}

1 0

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

26 Oct '23

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 : dmime: Skip sequence track chunk on parsing failure.
by Alexandre Julliard 26 Oct '23

26 Oct '23

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: Skip segment chunk on parsing failure (or success).
by Alexandre Julliard 26 Oct '23

26 Oct '23

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 : dmime: Ignore badly formed wave if format and data have been found.
by Alexandre Julliard 26 Oct '23

26 Oct '23

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: Remove shadowing local hr variable.
by Alexandre Julliard 26 Oct '23

26 Oct '23

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 : dmusic: Ignore some known wave chunks.
by Alexandre Julliard 26 Oct '23

26 Oct '23

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

Sven Baars : wined3d: Don't override the default renderer in wined3d_dll_init().
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 1b06627ac4b0db6eddefcae1fb9c42160dfdb819 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b06627ac4b0db6eddefcae1fb9c42… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Oct 24 14:57:26 2023 -0500 wined3d: Don't override the default renderer in wined3d_dll_init(). --- dlls/wined3d/wined3d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 11646d3705d..1368b4fc905 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -134,6 +134,9 @@ struct wined3d_settings wined3d_settings = enum wined3d_renderer CDECL wined3d_get_renderer(void) { + if (wined3d_settings.renderer == WINED3D_RENDERER_AUTO) + return WINED3D_RENDERER_OPENGL; + return wined3d_settings.renderer; } @@ -499,9 +502,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) vkd3d_set_log_callback(vkd3d_log_callback); - if (wined3d_settings.renderer == WINED3D_RENDERER_AUTO) - wined3d_settings.renderer = WINED3D_RENDERER_OPENGL; - return TRUE; }

1 0

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

26 Oct '23

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