July 2020 - Wine-Commits - list.winehq.org

Shawn M. Chapla : gdiplus/tests: Add metafile FillRegion test.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 5ccd10fce886573bce23cc61004ddb0e7a86cb28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ccd10fce886573bce23cc61… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Mon Jul 20 22:45:17 2020 -0400 gdiplus/tests: Add metafile FillRegion test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 8179e1a5fd..f0b31b4f9c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3174,6 +3174,102 @@ static void test_unknownfontdecode(void) GdipDisposeImage((GpImage*)metafile); } +static const emfplus_record fillregion_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeRegion << 8, 1 }, + { EmfPlusRecordTypeFillRegion, 0x8000, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeRegion << 8) | 2, 1 }, + { EmfPlusRecordTypeFillRegion, 2, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_fillregion(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 GpRectF solidrect = {20.0, 20.0, 20.0, 20.0}; + static const GpRectF hatchrect = {50.0, 50.0, 20.0, 20.0}; + + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + GpBitmap *bitmap; + GpBrush *solidbrush, *hatchbrush; + GpRegion *solidregion, *hatchregion; + ARGB color; + HDC hdc; + + hdc = CreateCompatibleDC(0); + 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 = GdipCreateRegionRect(&solidrect, &solidregion); + expect(Ok, stat); + + stat = GdipCreateSolidFill(0xffaabbcc, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipFillRegion(graphics, solidbrush, solidregion); + expect(Ok, stat); + + stat = GdipCreateRegionRect(&hatchrect, &hatchregion); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, 0xffff0000, 0xff0000ff, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipFillRegion(graphics, hatchbrush, hatchregion); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + expect(Ok, stat); + + check_metafile(metafile, fillregion_records, "regionfill metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "regionfill.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, fillregion_records, "regionfill playback", + dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 25, 25, &color); + expect(Ok, stat); + todo_wine expect(0xffaabbcc, color); + + stat = GdipBitmapGetPixel(bitmap, 56, 56, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 57, 57, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + GdipDeleteRegion(solidregion); + GdipDeleteRegion(hatchregion); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3225,6 +3321,7 @@ START_TEST(metafile) test_restoredc(); test_drawdriverstring(); test_unknownfontdecode(); + test_fillregion(); GdiplusShutdown(gdiplusToken); }

1 0

Piotr Caban : msvcrt: Copy strchr implementation from ntdll.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 45be36130f5bc5732e2bb704f1a97e4fa4da14d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45be36130f5bc5732e2bb704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:33 2020 +0200 msvcrt: Copy strchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fe86f14f57..4038ed41cd 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2284,7 +2284,11 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) */ char* __cdecl MSVCRT_strchr(const char *str, int c) { - return strchr(str, c); + do + { + if (*str == (char)c) return (char*)str; + } while (*str++); + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy strlen implementation from ntdll.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 770d3b8623c008c68c0751c442cd1ea26c01bd2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=770d3b8623c008c68c0751c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:40 2020 +0200 msvcrt: Copy strlen implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4038ed41cd..f646cee9df 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1266,7 +1266,9 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, */ MSVCRT_size_t __cdecl MSVCRT_strlen(const char *str) { - return strlen(str); + const char *s = str; + while (*s) s++; + return s - str; } /******************************************************************

1 0

Dmitry Timoshkov : usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 24e09ac5823083bfd2e283e8b19e96a60d745e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24e09ac5823083bfd2e283e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 21 18:57:00 2020 +0800 usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts. Use same check as ScriptShapeOpenType() does, fixes painting of non-latin characters in Wordpad using MS Sans Serif font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 322091c547..a6664279b5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3607,10 +3607,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; + fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt) + fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */ if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) return E_OUTOFMEMORY;

1 0

Paul Gofman : kernel32: Zero initialize module data in fetch_module().
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 3d54677586eb0a9f379839cd06c04d03fde380f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d54677586eb0a9f379839cd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 22 16:06:12 2020 +0300 kernel32: Zero initialize module data in fetch_module(). Otherwise unitialized name string pointers may be freed in CreateToolhelp32Snapshot(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49590 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/toolhelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index d55e8185f2..d072ccaefc 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -108,9 +108,9 @@ static BOOL fetch_module( DWORD process, DWORD flags, LDR_DATA_TABLE_ENTRY **ldr while (curr != head) { if (!*num) - *ldr_mod = HeapAlloc( GetProcessHeap(), 0, sizeof(LDR_DATA_TABLE_ENTRY) ); + *ldr_mod = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LDR_DATA_TABLE_ENTRY) ); else - *ldr_mod = HeapReAlloc( GetProcessHeap(), 0, *ldr_mod, + *ldr_mod = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *ldr_mod, (*num + 1) * sizeof(LDR_DATA_TABLE_ENTRY) ); if (!*ldr_mod) break; if (!ReadProcessMemory( hProcess,

1 0

Shawn M. Chapla : gdiplus: Add FillRegion serialization.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 1cb437ac256280cfab5c325b660dd4833d17cda8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb437ac256280cfab5c325b… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Mon Jul 20 22:45:19 2020 -0400 gdiplus: Add FillRegion serialization. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 13 ++++++++---- dlls/gdiplus/metafile.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 16 +++++++------- 4 files changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1b2de4e8f4..aac5509afa 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -107,6 +107,8 @@ extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath * extern GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, INT length, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, + GpRegion* region) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1307bdc1ef..f0da41c6cb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4700,11 +4700,16 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if(graphics->busy) return ObjectBusy; - if (!graphics->image && !graphics->alpha_hdc) - stat = GDI32_GdipFillRegion(graphics, brush, region); + if (graphics->image && graphics->image->type == ImageTypeMetafile) + stat = METAFILE_FillRegion((GpMetafile*)graphics->image, brush, region); + else + { + if (!graphics->image && !graphics->alpha_hdc) + stat = GDI32_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented) - stat = SOFTWARE_GdipFillRegion(graphics, brush, region); + if (stat == NotImplemented) + stat = SOFTWARE_GdipFillRegion(graphics, brush, region); + } if (stat == NotImplemented) { diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ed4e8a8be4..1d7c0fe306 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4854,3 +4854,51 @@ GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, return Ok; } + +GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* region) +{ + GpStatus stat; + DWORD brush_id; + DWORD region_id; + EmfPlusFillRegion *fill_region_record; + BOOL inline_color; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && + metafile->metafile_type != MetafileTypeEmfPlusDual) + { + FIXME("metafile type not supported: %i\n", metafile->metafile_type); + return NotImplemented; + } + + inline_color = (brush->bt == BrushTypeSolidColor); + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) + return stat; + } + + stat = METAFILE_AddRegionObject(metafile, region, &region_id); + if (stat != Ok) + return stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillRegion), + (void**)&fill_region_record); + if (stat != Ok) + return stat; + + fill_region_record->Header.Type = EmfPlusRecordTypeFillRegion; + fill_region_record->Header.Flags = region_id; + + if (inline_color) + { + fill_region_record->Header.Flags |= 0x8000; + fill_region_record->data.Color = ((GpSolidFill*)brush)->color; + } + else + fill_region_record->data.BrushId = brush_id; + + METAFILE_WriteRecords(metafile); + + return Ok; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f0b31b4f9c..ddb58504c9 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3177,11 +3177,11 @@ static void test_unknownfontdecode(void) static const emfplus_record fillregion_records[] = { { EMR_HEADER }, { EmfPlusRecordTypeHeader }, - { EmfPlusRecordTypeObject, ObjectTypeRegion << 8, 1 }, - { EmfPlusRecordTypeFillRegion, 0x8000, 1 }, - { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 1, 1 }, - { EmfPlusRecordTypeObject, (ObjectTypeRegion << 8) | 2, 1 }, - { EmfPlusRecordTypeFillRegion, 2, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeRegion << 8 }, + { EmfPlusRecordTypeFillRegion, 0x8000 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeRegion << 8) | 2 }, + { EmfPlusRecordTypeFillRegion, 2 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF }, { 0 } @@ -3251,15 +3251,15 @@ static void test_fillregion(void) stat = GdipBitmapGetPixel(bitmap, 25, 25, &color); expect(Ok, stat); - todo_wine expect(0xffaabbcc, color); + expect(0xffaabbcc, color); stat = GdipBitmapGetPixel(bitmap, 56, 56, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); + expect(0xffff0000, color); stat = GdipBitmapGetPixel(bitmap, 57, 57, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); GdipDeleteRegion(solidregion); GdipDeleteRegion(hatchregion);

1 0

Ziqing Hui : windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 07030059486e0121051b452c94d37f12931cabf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07030059486e0121051b452c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 21 13:49:53 2020 +0800 windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index aebe31c1d5..31b65f73ca 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -24,8 +24,8 @@ #include "wincodec.h" #include "wine/test.h" -/* 4x4 uncompressed(16bpp BGR565) DDS image */ -static BYTE test_dds_bgr565[] = { +/* 4x4 uncompressed(16bpp RGB565) DDS image */ +static BYTE test_dds_rgb565[] = { 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -284,7 +284,7 @@ static struct test_data { WICDdsParameters expected_parameters; BOOL wine_init; } test_data[] = { - { test_dds_bgr565, sizeof(test_dds_bgr565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat32bppBGRA, + { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE },

1 0

Piotr Caban : msvcrt: Copy strcat implementation from ntdll.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: f6763553660d3df7b0f8710476505bdd3cf389b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6763553660d3df7b0f87104… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:35 2020 +0200 msvcrt: Copy strcat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 11 +++++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index aae66d828c..dddc8a6bd1 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -463,7 +463,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 68d1ee3f0f..12699a71fa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1795,7 +1795,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 13abe6ad64..785baaef61 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2153,7 +2153,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7181184938..83daf454b6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2363,7 +2363,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index d4114a24fe..9e8c9020eb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -809,7 +809,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c1b1c68f1f..cd780ae7d9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -805,7 +805,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 916245cb26..4a5e0875c2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1475,7 +1475,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2967858bc..5401cd2a9c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1448,7 +1448,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51ecb095db..36284cf14a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1417,7 +1417,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8842e0791e..fe86f14f57 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1116,6 +1116,17 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) return MSVCRT_ERANGE; } +/********************************************************************* + * strcat (MSVCRT.@) + */ +char* __cdecl MSVCRT_strcat( char *dst, const char *src ) +{ + char *d = dst; + while (*d) d++; + while ((*d++ = *src++)); + return dst; +} + /********************************************************************* * strncat_s (MSVCRT.@) */ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 8c775c61a4..c8ed824adf 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -761,7 +761,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2577649421..6dc73d47fd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2494,7 +2494,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp

1 0

Piotr Caban : msvcrt: Copy memset implementation from ntdll.
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 41a5da9b763c2d7009cdbc84cdcab0f7453fe13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a5da9b763c2d7009cdbc84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:28 2020 +0200 msvcrt: Copy memset implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8612780722..8842e0791e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2263,7 +2263,9 @@ void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) */ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) { - return memset(dst, c, n); + volatile unsigned char *d = dst; /* avoid gcc optimizations */ + while (n--) *d++ = c; + return dst; } /*********************************************************************

1 0

Zebediah Figura : qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause().
by Alexandre Julliard July 22, 2020

July 22, 2020

Module: wine Branch: master Commit: 5e407cec530e2d79f04a755e7f818c2ef84d725e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e407cec530e2d79f04a755e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 21 17:49:58 2020 -0500 qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7d82a01109..910be107b0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -124,7 +124,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) VfwCapture *filter = impl_from_strmbase_filter(iface); filter->device->ops->init_stream(filter->device); - return VFW_S_CANT_CUE; + return S_OK; } static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) @@ -140,7 +140,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface) VfwCapture *filter = impl_from_strmbase_filter(iface); filter->device->ops->stop_stream(filter->device); - return VFW_S_CANT_CUE; + return S_OK; } static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) @@ -151,6 +151,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) return S_OK; } +static HRESULT vfw_capture_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = vfw_capture_get_pin, @@ -160,6 +165,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_start_stream = vfw_capture_start_stream, .filter_stop_stream = vfw_capture_stop_stream, .filter_cleanup_stream = vfw_capture_cleanup_stream, + .filter_wait_state = vfw_capture_wait_state, }; static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out)

1 0