April 2023 - Wine-commits - list.winehq.org

Piotr Caban : gdi32/tests: Add EMF palette tests.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 28df39908a7091143e38dd5a474ccd6448aba586 URL: https://gitlab.winehq.org/wine/wine/-/commit/28df39908a7091143e38dd5a474ccd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 22:16:44 2023 +0200 gdi32/tests: Add EMF palette tests. --- dlls/gdi32/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2b7e53b2529..0e5da463f7f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4802,6 +4802,83 @@ static void test_mf_palette(void) ok(ret, "DeleteMetaFile(%p) error %ld\n", hmf, GetLastError()); } +static void test_emf_palette(void) +{ + char logpalettebuf[sizeof(LOGPALETTE) + sizeof(logpalettedata)]; + LOGPALETTE *logpalette = (PLOGPALETTE)logpalettebuf; + HPALETTE hpal, old_pal, def_pal; + HENHMETAFILE emf; + HDC hdc; + BOOL ret; + + static const unsigned char palette_bits[] = + { + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xcd, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x9f, 0xed, 0x03, 0x00, 0x31, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x03, 0x08, 0x00, 0x10, 0x20, 0x30, 0x00, + 0x20, 0x30, 0x40, 0x00, 0x30, 0x40, 0x50, 0x00, + 0x40, 0x50, 0x60, 0x00, 0x50, 0x60, 0x70, 0x00, + 0x60, 0x70, 0x80, 0x00, 0x70, 0x80, 0x90, 0x00, + 0x80, 0x90, 0xa0, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x80, 0x0e, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, + 0x20, 0x30, 0x40, 0x00, 0x30, 0x40, 0x50, 0x00, + 0x40, 0x50, 0x60, 0x00, 0x50, 0x60, 0x70, 0x00, + 0x60, 0x70, 0x80, 0x00, 0x70, 0x80, 0x90, 0x00, + 0x80, 0x90, 0xa0, 0x00, 0x34, 0x00, 0x00, 0x00 + }; + + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateMetaFileA error %ld\n", GetLastError()); + + /* Initialize the logical palette with a few colours */ + logpalette->palVersion = 0x300; + logpalette->palNumEntries = ARRAY_SIZE(logpalettedata); + memcpy(logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata)); + hpal = CreatePalette(logpalette); + old_pal = SelectPalette(hdc, hpal, FALSE); + def_pal = GetStockObject(DEFAULT_PALETTE); + ok(old_pal == def_pal, "old_pal=%p, expected %p\n", old_pal, def_pal); + + ret = RealizePalette(hdc); + ok(!ret, "RealizePalette returned %d\n", ret); + + old_pal = SelectPalette(hdc, GetStockObject(DEFAULT_PALETTE), FALSE); + ok(old_pal == hpal, "old_pal=%p, expected %p\n", old_pal, hpal); + + ret = RealizePalette(hdc); + ok(!ret, "RealizePalette returned %d\n", ret); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile error %ld\n", GetLastError()); + + if (compare_emf_bits(emf, palette_bits, sizeof(palette_bits), "emf_palette", FALSE)) + { + dump_emf_bits(emf, "emf_palette"); + dump_emf_records(emf, "emf_palette"); + } + + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); +} + static void test_mf_blit(void) { BITMAPINFO bmi = {{ sizeof(bmi) }}; @@ -10670,6 +10747,7 @@ START_TEST(metafile) test_emf_mask_blit(); test_emf_StretchDIBits(); test_emf_SetDIBitsToDevice(); + test_emf_palette(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Piotr Caban : wineps: Handle EMR_REALIZEPALETTE record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: d200b0fcf23b1d14e6eb866e0fdfec12ec172ba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d200b0fcf23b1d14e6eb866e0fdfec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:31 2023 +0200 wineps: Handle EMR_REALIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 48f584e1a7e..37053e8061f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH:

1 0

Piotr Caban : wineps: Handle EMR_RESIZEPALETTE record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: d1d7f1a5dce276d1b159cc835909ae51cd66d424 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d7f1a5dce276d1b159cc835909ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:58 2023 +0200 wineps: Handle EMR_RESIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 37053e8061f..f72a1a08b5b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE:

1 0

Piotr Caban : wineps: Handle EMR_SETPALETTEENTRIES record in spool files.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 3fdff0b10651485715f02a799771f70966083a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fdff0b10651485715f02a799771f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:27:23 2023 +0200 wineps: Handle EMR_SETPALETTEENTRIES record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f72a1a08b5b..0169873ceaf 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_SETPALETTEENTRIES: case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION:

1 0

Piotr Caban : gdi32: Use EMR_REALIZEPALETTE to record RealizePalette.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: c752e84543e6c96a06eb8bd61aaad9891200addf URL: https://gitlab.winehq.org/wine/wine/-/commit/c752e84543e6c96a06eb8bd61aaad9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:31:41 2023 +0200 gdi32: Use EMR_REALIZEPALETTE to record RealizePalette. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/emfdc.c | 14 ++++++++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 19 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 44dd9b9373d..8fa30884baf 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2153,7 +2153,11 @@ HPALETTE WINAPI SelectPalette( HDC hdc, HPALETTE palette, BOOL force_background */ UINT WINAPI RealizePalette( HDC hdc ) { + DC_ATTR *dc_attr; + if (is_meta_dc( hdc )) return METADC_RealizePalette( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_RealizePalette( dc_attr )) return 0; return pfnRealizePalette( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index bf35450cfb3..f3ee0e3611c 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -696,6 +696,20 @@ BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) return emfdc_record( emf, &emr.emr ); } +BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) +{ + HPALETTE palette = GetCurrentObject( dc_attr_handle( dc_attr ), OBJ_PAL ); + struct emf *emf = get_dc_emf( dc_attr ); + EMRREALIZEPALETTE emr; + + if (palette == GetStockObject( DEFAULT_PALETTE )) + return TRUE; + + emr.emr.iType = EMR_REALIZEPALETTE; + emr.emr.nSize = sizeof(emr); + return emfdc_record( emf, &emr.emr ); +} + BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) { switch (gdi_handle_type( obj )) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index da4c951eb00..4a9c70dcbc3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -225,6 +225,7 @@ extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT extern BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polyline( DC_ATTR *dc_attr, const POINT *points, INT count) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RestoreDC( DC_ATTR *dc_attr, INT level ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdi32: Fix EMR_CREATEPALETTE recording.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: b9b159e5a85a84fca2284c954fb7e7ba210a89c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9b159e5a85a84fca2284c954fb7e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:33:01 2023 +0200 gdi32: Fix EMR_CREATEPALETTE recording. --- dlls/gdi32/emfdc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index f3ee0e3611c..cc8e78a3cb5 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -651,27 +651,27 @@ static BOOL emfdc_select_pen( DC_ATTR *dc_attr, HPEN pen ) static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) { + BYTE data[offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[256] )]; + EMRCREATEPALETTE *hdr = (EMRCREATEPALETTE *)data; WORD i; - struct { - EMRCREATEPALETTE hdr; - PALETTEENTRY entry[255]; - } pal; - memset( &pal, 0, sizeof(pal) ); + memset( data, 0, sizeof(data) ); - if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + hdr->lgpl.palVersion = 0x300; + hdr->lgpl.palNumEntries = GetPaletteEntries( hPal, 0, 256, hdr->lgpl.palPalEntry ); + if (!hdr->lgpl.palNumEntries) return 0; - for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) - pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + for (i = 0; i < hdr->lgpl.palNumEntries; i++) + hdr->lgpl.palPalEntry[i].peFlags = 0; - pal.hdr.emr.iType = EMR_CREATEPALETTE; - pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); - pal.hdr.ihPal = emfdc_add_handle( emf, hPal ); + hdr->emr.iType = EMR_CREATEPALETTE; + hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); + hdr->ihPal = emfdc_add_handle( emf, hPal ); - if (!emfdc_record( emf, &pal.hdr.emr )) - pal.hdr.ihPal = 0; - return pal.hdr.ihPal; + if (!emfdc_record( emf, &hdr->emr )) + hdr->ihPal = 0; + return hdr->ihPal; } BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette )

1 0

Ziqing Hui : mfreadwrite: Fix an address of operator typo.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: d1c317720ab6a92811c013408844ffd9e581b2a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1c317720ab6a92811c013408844ff… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 19 16:23:32 2023 +0800 mfreadwrite: Fix an address of operator typo. --- dlls/mfreadwrite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index aaf972734c4..83b0442b20e 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -1070,7 +1070,7 @@ static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttribute for (i = 0; i < ARRAY_SIZE(class_map); ++i) { - if (IsEqualGUID(&container, &class_map[i].container)) + if (IsEqualGUID(&container, class_map[i].container)) { *clsid = *class_map[i].clsid; return S_OK;

1 0

Zebediah Figura : vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic().
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: vkd3d Branch: master Commit: b46df551eba19ccf45ad907bef0e622367fef3da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b46df551eba19ccf45ad907bef0e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 20 17:53:54 2023 -0500 vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic(). Fix a compile warning: ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c: In function 'allocate_semantic_register': ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:2947:85: error: passing argument 4 of 'hlsl_sm4_register_from_semantic' from incompatible pointer type [-Werror=incompatible-pointer-types] 2947 | if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, NULL, &has_idx))) | ^~~~~ | | | unsigned int * In file included from ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:21: ../vkd3d/libs/vkd3d-shader/hlsl.h:1171:52: note: expected 'enum vkd3d_sm4_register_type *' but argument is of type 'unsigned int *' 1171 | bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/tpf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 86f35df2..974252d4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1168,7 +1168,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 80487060..e76cf8c9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2222,7 +2222,7 @@ static bool type_is_integer(const struct hlsl_type *type) } bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { unsigned int i;

1 0

Brendan Shanks : msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: e414561a96156b028f73b0cf223ccf3dc9ad3587 URL: https://gitlab.winehq.org/wine/wine/-/commit/e414561a96156b028f73b0cf223ccf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 20 14:39:42 2023 -0700 msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64. --- dlls/msvcrt/except_x86_64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d40b9985cd2..b07a7b83772 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -579,14 +579,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (rec->ExceptionCode == CXX_EXCEPTION && + (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } if (rec->ExceptionCode == CXX_EXCEPTION) { - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - { - TRACE("rethrow detected.\n"); - *rec = *msvcrt_get_thread_data()->exc_record; - } - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0

Alexandre Julliard : makedep: Avoid generating empty dependencies.
by Alexandre Julliard 21 Apr '23

21 Apr '23

Module: wine Branch: master Commit: 7e8ac46a5c33867bc4884aaae7d4a7f7fb308251 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e8ac46a5c33867bc4884aaae7d4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 09:54:37 2023 +0200 makedep: Avoid generating empty dependencies. --- tools/makedep.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3b5fa7085ab..00ebfa27e8f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -75,8 +75,8 @@ struct incl_file int included_line; /* line where this file was included */ enum incl_type type; /* type of include */ unsigned int arch; /* architecture for multi-arch files, otherwise 0 */ - int use_msvcrt:1; /* put msvcrt headers in the search path? */ - int is_external:1; /* file from external library? */ + unsigned int use_msvcrt:1; /* put msvcrt headers in the search path? */ + unsigned int is_external:1; /* file from external library? */ struct incl_file *owner; unsigned int files_count; /* files in use */ unsigned int files_size; /* total allocated size */ @@ -3241,10 +3241,13 @@ static void output_source_default( struct makefile *make, struct incl_file *sour strarray_add( &make->test_files, obj ); } - output_filenames_obj_dir( make, targets ); - output( ":" ); - output_filenames( source->dependencies ); - output( "\n" ); + if (targets.count && source->dependencies.count) + { + output_filenames_obj_dir( make, targets ); + output( ":" ); + output_filenames( source->dependencies ); + output( "\n" ); + } }

1 0