October 2023 - Wine-Commits

Hans Leidekker : advapi32/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 362f953748c2e6ad3c2278c984bc522ae4a769eb URL: https://gitlab.winehq.org/wine/wine/-/commit/362f953748c2e6ad3c2278c984bc52… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 25 17:25:06 2023 +0200 advapi32/tests: Get rid of workarounds for old Windows versions. --- dlls/advapi32/tests/registry.c | 124 +++++++++++++---------------------------- 1 file changed, 40 insertions(+), 84 deletions(-)

1 0

Brendan Shanks : winemac.drv: Disable declaration-after-statement warnings in ObjC files.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 5d78428fa815e86b9f8eb70c9be2055e4d19b94e URL: https://gitlab.winehq.org/wine/wine/-/commit/5d78428fa815e86b9f8eb70c9be205… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 24 21:50:03 2023 -0500 winemac.drv: Disable declaration-after-statement warnings in ObjC files. --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_clipboard.m | 2 ++ dlls/winemac.drv/cocoa_cursorclipping.m | 2 ++ dlls/winemac.drv/cocoa_display.m | 2 ++ dlls/winemac.drv/cocoa_event.m | 2 ++ dlls/winemac.drv/cocoa_main.m | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 2 ++ dlls/winemac.drv/cocoa_status_item.m | 2 ++ dlls/winemac.drv/cocoa_window.m | 1 + 9 files changed, 17 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c1a35af5a00..4e26bf1e122 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -25,6 +25,8 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode"; diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index cc5d1ffe55e..a3dca323705 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -23,6 +23,8 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + #if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14 /* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */ #define NSBitmapImageFileTypeBMP NSBMPFileType diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index faefa5030e7..cfb7ff529e7 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -23,6 +23,8 @@ #import "cocoa_cursorclipping.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + /* Neither Quartz nor Cocoa has an exact analog for Win32 cursor clipping. * diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 856fa2ea77a..fbbe16efcbf 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -26,6 +26,8 @@ #endif #include "macdrv_cocoa.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static uint64_t dedicated_gpu_id; static uint64_t integrated_gpu_id; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 701de6eb8f7..11dd9c3c784 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -29,6 +29,8 @@ #import "cocoa_app.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThreadDictionaryKey"; diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m index 73a2514a61a..8c9507a75b1 100644 --- a/dlls/winemac.drv/cocoa_main.m +++ b/dlls/winemac.drv/cocoa_main.m @@ -25,6 +25,8 @@ #include "macdrv_cocoa.h" #import "cocoa_app.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + /* Condition values for an NSConditionLock. Used to signal between run_cocoa_app and macdrv_start_cocoa_app so the latter knows when the former is running diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 43574972600..31a1f28970b 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -26,6 +26,8 @@ #include "cocoa_app.h" #include "cocoa_event.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + @interface WineOpenGLContext () @property (retain, nonatomic) NSView* latentView; diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 1ffdeb8048d..31f8a668d81 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -23,6 +23,8 @@ #import "cocoa_app.h" #import "cocoa_event.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + @interface WineStatusItem : NSView { diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e2373b4837c..5700bd3d531 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -33,6 +33,7 @@ #import "cocoa_event.h" #import "cocoa_opengl.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */

1 0

Jeff Smith : gdiplus: Fix GdipSetPageUnit parameter validation.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 6972aa77c1c884b909f5c60c0fcb7e8bf9ef92a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6972aa77c1c884b909f5c60c0fcb7e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:21:22 2023 -0500 gdiplus: Fix GdipSetPageUnit parameter validation. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6cc0c3bfbe3..371629a5bef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6197,7 +6197,7 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) if(graphics->busy) return ObjectBusy; - if(unit == UnitWorld) + if(unit == UnitWorld || unit > UnitMillimeter) return InvalidParameter; if (is_metafile_graphics(graphics)) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5f502b72593..724be3f1030 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4104,7 +4104,6 @@ static void test_set_page_transform(void) { 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) { @@ -4131,7 +4130,6 @@ static void test_set_page_transform(void) status = GdipGetPageUnit(graphics, &unit); expect(Ok, status); - todo_wine expect(UnitMillimeter, unit); status = GdipGetPageScale(graphics, &scale); expect(Ok, status);

1 0

Jeff Smith : gdiplus: Fix a GdipSetPageScale return status.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 8f7749aa451b0fc7c7ef7932cbc2ed28f603500d URL: https://gitlab.winehq.org/wine/wine/-/commit/8f7749aa451b0fc7c7ef7932cbc2ed… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:17:58 2023 -0500 gdiplus: Fix a GdipSetPageScale return status. --- dlls/gdiplus/graphics.c | 5 ++++- dlls/gdiplus/tests/graphics.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 32c45458c8f..6cc0c3bfbe3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6164,12 +6164,15 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) TRACE("(%p, %.2f)\n", graphics, scale); - if(!graphics || (scale <= 0.0)) + if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; + if(scale <= 0.0) + return InvalidParameter; + if (is_metafile_graphics(graphics)) { stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, graphics->unit, scale); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 784a88d9a70..5f502b72593 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1847,7 +1847,6 @@ static void test_Get_Release_DC(void) 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);

1 0

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

Oct. 26, 2023

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 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