wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Jacek Caban : gdi32: Use zero biClrUsed in emfdc_create_brush when possible.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 5863f0af57f145ac3f217342f2ac630a82079244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5863f0af57f145ac3f217342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:01 2021 +0200 gdi32: Use zero biClrUsed in emfdc_create_brush when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 2 + dlls/gdi32/tests/metafile.c | 129 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 300e2507852..0fb2d99dcef 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -230,6 +230,8 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) emr->cbBits = info->bmiHeader.biSizeImage; emr->emr.nSize = emr->offBits + emr->cbBits; + if (info->bmiHeader.biClrUsed == 1 << info->bmiHeader.biBitCount) + info->bmiHeader.biClrUsed = 0; memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); get_brush_bitmap_info( brush, NULL, (char *)emr + emr->offBits, NULL ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5e10c654388..693353ea5f2 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1459,6 +1459,69 @@ static const unsigned char EMF_GRADIENTFILL_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char emf_pattern_brush_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, 0xe5, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xd8, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x77, 0x07, 0x00, 0x00, 0x3b, 0x04, 0x00, 0x00, + 0xfa, 0x01, 0x00, 0x00, 0x1f, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x12, 0xb7, 0x07, 0x00, + 0x4f, 0x5f, 0x04, 0x00, 0x5d, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x28, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x25, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, + 0xd4, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x28, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, + 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x1a, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, + 0x25, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static const unsigned char mf_palette_brush_bits[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0xb2, 0x03, @@ -3866,6 +3929,71 @@ static void test_mf_PatternBrush(void) HeapFree (GetProcessHeap(), 0, orig_lb); } +static void test_emf_pattern_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + HDC hdc; + HENHMETAFILE emf; + LOGBRUSH *orig_lb; + HBRUSH bitmap_brush, dib_brush; + DWORD *bits; + unsigned int i; + BOOL ret; + + orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); + + orig_lb->lbStyle = BS_PATTERN; + orig_lb->lbColor = RGB(0, 0, 0); + orig_lb->lbHatch = (ULONG_PTR)CreateBitmap(8, 8, 1, 1, SAMPLE_PATTERN_BRUSH); + ok((HBITMAP)orig_lb->lbHatch != NULL, "CreateBitmap error %d.\n", GetLastError()); + + bitmap_brush = CreateBrushIndirect(orig_lb); + ok(bitmap_brush != 0, "CreateBrushIndirect error %d\n", GetLastError()); + + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + bitmap_brush = SelectObject(hdc, bitmap_brush); + ok(bitmap_brush != 0, "SelectObject error %d.\n", GetLastError()); + + memset(info, 0, sizeof(buffer)); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = 32; + info->bmiHeader.biWidth = 32; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + bits = (DWORD *)info->bmiColors; + for (i = 0; i < 32 * 32 / 8; i++) bits[i] = i; + + dib_brush = CreateDIBPatternBrushPt(info, DIB_RGB_COLORS); + ok(dib_brush != NULL, "CreatePatternBrush failed\n"); + + dib_brush = SelectObject(hdc, dib_brush); + ok(dib_brush != 0, "SelectObject error %d.\n", GetLastError()); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(emf, emf_pattern_brush_bits, sizeof(emf_pattern_brush_bits), + "emf_pattern_brush", FALSE)) + { + dump_emf_bits(emf, "emf_pattern_brush"); + dump_emf_records(emf, "emf_pattern_brush"); + } + + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %d\n", GetLastError()); + ret = DeleteObject(bitmap_brush); + ok(ret, "DeleteObject failed\n"); + ret = DeleteObject(dib_brush); + ok(ret, "DeleteObject failed\n"); + ret = DeleteObject((HBITMAP)orig_lb->lbHatch); + ok(ret, "DeleteObject failed\n"); + HeapFree(GetProcessHeap(), 0, orig_lb); +} + static void test_mf_palette_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD) + 16 * 16]; @@ -7492,6 +7620,7 @@ START_TEST(metafile) test_emf_attrs(); test_emf_select(); test_emf_blit(); + test_emf_pattern_brush(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Jacek Caban : gdi32: Copy brush bits in get_brush_bitmap_info.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 1ba1736238cfadcbd662471046d6b11ff38a258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba1736238cfadcbd6624710… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:10:44 2021 +0200 gdi32: Copy brush bits in get_brush_bitmap_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 35 +++++++++++++++++++++++++++++------ dlls/gdi32/emfdc.c | 5 ++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/metadc.c | 19 ++----------------- dlls/gdi32/ntgdi_private.h | 1 - 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 7c43df0dfcf..8ef902f60b9 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -140,7 +140,7 @@ void free_brush_pattern( struct brush_pattern *pattern ) HeapFree( GetProcessHeap(), 0, pattern->info ); } -BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) +BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) { BRUSHOBJ *brush; BOOL ret = FALSE; @@ -149,11 +149,34 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (brush->pattern.info) { - memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); - if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) - fill_default_color_table( info ); - *bits = brush->pattern.bits.ptr; - *usage = brush->pattern.usage; + if (info) + { + memcpy( info, brush->pattern.info, + get_dib_info_size( brush->pattern.info, brush->pattern.usage )); + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) + fill_default_color_table( info ); + if (info->bmiHeader.biHeight < 0) + info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + } + if (bits) + { + /* always return a bottom-up DIB */ + if (brush->pattern.info->bmiHeader.biHeight < 0) + { + unsigned int i, width_bytes, height = -brush->pattern.info->bmiHeader.biHeight; + char *dst_ptr; + + width_bytes = get_dib_stride( brush->pattern.info->bmiHeader.biWidth, + brush->pattern.info->bmiHeader.biBitCount ); + dst_ptr = (char *)bits + (height - 1) * width_bytes; + for (i = 0; i < height; i++, dst_ptr -= width_bytes) + memcpy( dst_ptr, (char *)brush->pattern.bits.ptr + i * width_bytes, + width_bytes ); + } + else memcpy( bits, brush->pattern.bits.ptr, + brush->pattern.info->bmiHeader.biSizeImage ); + } + if (usage) *usage = brush->pattern.usage; ret = TRUE; } GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 6dc7229b574..300e2507852 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -190,10 +190,9 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; DWORD info_size; - void *bits; UINT usage; - if (!get_brush_bitmap_info( brush, info, &bits, &usage )) break; + if (!get_brush_bitmap_info( brush, info, NULL, &usage )) break; info_size = get_dib_info_size( info, usage ); emr = HeapAlloc( GetProcessHeap(), 0, @@ -232,7 +231,7 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) emr->emr.nSize = emr->offBits + emr->cbBits; memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); - memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits ); + get_brush_bitmap_info( brush, NULL, (char *)emr + emr->offBits, NULL ); if (!emfdc_record( emf, &emr->emr )) index = 0; HeapFree( GetProcessHeap(), 0, emr ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 675a2990215..7a4a8773f3f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -224,4 +224,7 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, + UINT *usage ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index 1f9d2f86b77..f4b313ba5db 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -546,11 +546,9 @@ static INT16 metadc_create_brush( struct metadc *metadc, HBRUSH brush ) char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; DWORD info_size; - char *dst_ptr; - void *bits; UINT usage; - if (!get_brush_bitmap_info( brush, src_info, &bits, &usage )) goto done; + if (!get_brush_bitmap_info( brush, src_info, NULL, &usage )) goto done; info_size = get_dib_info_size( src_info, usage ); size = FIELD_OFFSET( METARECORD, rdParm[2] ) + @@ -562,22 +560,9 @@ static INT16 metadc_create_brush( struct metadc *metadc, HBRUSH brush ) mr->rdParm[0] = logbrush.lbStyle; mr->rdParm[1] = usage; dst_info = (BITMAPINFO *)(mr->rdParm + 2); - memcpy( dst_info, src_info, info_size ); + get_brush_bitmap_info( brush, dst_info, (char *)dst_info + info_size, NULL ); if (dst_info->bmiHeader.biClrUsed == 1 << dst_info->bmiHeader.biBitCount) dst_info->bmiHeader.biClrUsed = 0; - dst_ptr = (char *)dst_info + info_size; - - /* always return a bottom-up DIB */ - if (dst_info->bmiHeader.biHeight < 0) - { - int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, - dst_info->bmiHeader.biBitCount ); - dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; - dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; - for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) - memcpy( dst_ptr, (char *)bits + i * width_bytes, width_bytes ); - } - else memcpy( dst_ptr, bits, src_info->bmiHeader.biSizeImage ); break; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ec3db21a2bd..b8273e8a405 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -170,7 +170,6 @@ extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, extern HBRUSH create_brush( const LOGBRUSH *brush ); extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Allocate extra DWORD for EMR_CREATEDIBPATTERNBRUSHPT records.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: d94d1a8b263a020575bf8dd76509d9e603434095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94d1a8b263a020575bf8dd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:09:53 2021 +0200 gdi32: Allocate extra DWORD for EMR_CREATEDIBPATTERNBRUSHPT records. Like for EMR_CREATEMONOBRUSH. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 479e0caa6b6..6dc7229b574 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -197,9 +197,16 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) info_size = get_dib_info_size( info, usage ); emr = HeapAlloc( GetProcessHeap(), 0, - sizeof(EMRCREATEDIBPATTERNBRUSHPT)+info_size+info->bmiHeader.biSizeImage ); + sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + + info_size+info->bmiHeader.biSizeImage ); if(!emr) break; + /* FIXME: There is an extra DWORD written by native before the BMI. + * Not sure what it's meant to contain. + */ + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); + *(DWORD *)(emr + 1) = 0x20000000; + if (logbrush.lbStyle == BS_PATTERN && info->bmiHeader.biBitCount == 1) { /* Presumably to reduce the size of the written EMF, MS supports an @@ -211,16 +218,11 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) */ emr->emr.iType = EMR_CREATEMONOBRUSH; usage = DIB_PAL_MONO; - /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what it's meant to contain. - */ - emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); emr->cbBmi = sizeof( BITMAPINFOHEADER ); } else { emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; - emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); emr->cbBmi = info_size; } emr->ihBrush = index = emfdc_add_handle( emf, brush );

1 0

Jacek Caban : gdi32/tests: Add more metafile brush tests.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 08d377c02fbbd63c351e927dfc8525680ce34c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d377c02fbbd63c351e927d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:09:47 2021 +0200 gdi32/tests: Add more metafile brush tests. Based on brush.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 351 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 346 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d377c02fbbd63c351e…

1 0

Gabriel Ivăncescu : jscript: Fix refcounting the object prototype fallback.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 59bb402bf1ff0a8492e910f6483b370a61d35f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59bb402bf1ff0a8492e910f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 6 20:01:59 2021 +0300 jscript: Fix refcounting the object prototype fallback. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 345bcd22020..e5d711a0a53 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1881,7 +1881,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); else - prot = ctx->object_prototype; + prot = jsdisp_addref(ctx->object_prototype); jsval_release(val); }

1 0

Alexandre Julliard : configure: Enable ws2_32 build on Windows.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 9a5f4b95db7acc12884717839931ff39b4b486d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a5f4b95db7acc1288471783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 23:16:47 2021 +0200 configure: Enable ws2_32 build on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index 99283e0ef18..5ed46f75b84 100755 --- a/configure +++ b/configure @@ -8357,7 +8357,6 @@ fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} - enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} diff --git a/configure.ac b/configure.ac index 26f74985924..68b666e455f 100644 --- a/configure.ac +++ b/configure.ac @@ -737,7 +737,6 @@ case $host_os in dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} - enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows

1 0

Alexandre Julliard : winecfg: Use Unicode functions throughout.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: d02d50299b236690738563e1db8c08d1cb603f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02d50299b236690738563e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 17:14:22 2021 +0200 winecfg: Use Unicode functions throughout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 2 +- programs/winecfg/about.c | 32 ++--- programs/winecfg/appdefaults.c | 240 ++++++++++++++++++------------------ programs/winecfg/audio.c | 16 +-- programs/winecfg/drive.c | 65 ++-------- programs/winecfg/driveui.c | 28 ++--- programs/winecfg/libraries.c | 270 ++++++++++++++++++++--------------------- programs/winecfg/main.c | 8 +- programs/winecfg/theme.c | 110 +++++++---------- programs/winecfg/winecfg.c | 163 ++----------------------- programs/winecfg/winecfg.h | 37 ++---- programs/winecfg/x11drvdlg.c | 72 +++++------ 12 files changed, 409 insertions(+), 634 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d02d50299b2366907385…

1 0

Alexandre Julliard : winecfg: Use wide character string literals.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: a243a7af9737adae2da35c2f6162362b196bb734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a243a7af9737adae2da35c2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:41:35 2021 +0200 winecfg: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/about.c | 6 ++-- programs/winecfg/appdefaults.c | 6 ++-- programs/winecfg/audio.c | 29 +++++++------------ programs/winecfg/drive.c | 6 ++-- programs/winecfg/driveui.c | 4 +-- programs/winecfg/main.c | 5 +--- programs/winecfg/theme.c | 32 +++++++-------------- programs/winecfg/winecfg.c | 8 ++---- programs/winecfg/x11drvdlg.c | 65 +++++++++++------------------------------- 9 files changed, 49 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a243a7af9737adae2da3…

1 0

Alexandre Julliard : winecfg: Build with msvcrt.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: fe9799314b30e801094a6cfef8a15bf403857285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9799314b30e801094a6cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:23:32 2021 +0200 winecfg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 2 ++ programs/winecfg/appdefaults.c | 3 +-- programs/winecfg/audio.c | 11 ++++------- programs/winecfg/drive.c | 3 --- programs/winecfg/driveui.c | 1 - programs/winecfg/libraries.c | 14 ++------------ programs/winecfg/theme.c | 8 ++------ programs/winecfg/winecfg.c | 3 +-- programs/winecfg/x11drvdlg.c | 19 +++++++++---------- 9 files changed, 21 insertions(+), 43 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index a2746f7d4ac..d39d3e50410 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -2,6 +2,8 @@ MODULE = winecfg.exe APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ about.c \ appdefaults.c \ diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 5155a845264..19901f7b542 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <assert.h> #include "wine/heap.h" -#include "wine/unicode.h" #include "winecfg.h" #include "resource.h" @@ -337,7 +336,7 @@ static void on_add_app_click(HWND dialog) ARRAY_SIZE(selectExecutableStr)); LoadStringW (GetModuleHandleW(NULL), IDS_EXECUTABLE_FILTER, programsFilter, ARRAY_SIZE(programsFilter)); - snprintfW( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); + swprintf( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); ofn.lpstrTitle = selectExecutableStr; ofn.lpstrFilter = filter; diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index a293c4710fd..039dc033d23 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -22,9 +22,6 @@ #define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -319,7 +316,7 @@ static void initAudioDlg (HWND hDlg) SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); - if(reg_out_dev && !lstrcmpW(render_devs[i].id, reg_out_dev)){ + if(reg_out_dev && !wcscmp(render_devs[i].id, reg_out_dev)){ SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_SETCURSEL, i + 1, 0); SendDlgItemMessageW(hDlg, IDC_SPEAKERCONFIG_SPEAKERS, CB_SETCURSEL, render_devs[i].speaker_config, 0); } @@ -328,7 +325,7 @@ static void initAudioDlg (HWND hDlg) 0, (LPARAM)render_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); - if(reg_vout_dev && !lstrcmpW(render_devs[i].id, reg_vout_dev)) + if(reg_vout_dev && !wcscmp(render_devs[i].id, reg_vout_dev)) SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_SETCURSEL, i + 1, 0); lvitem.mask = LVIF_TEXT | LVIF_PARAM; @@ -360,14 +357,14 @@ static void initAudioDlg (HWND hDlg) 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); - if(reg_in_dev && !lstrcmpW(capture_devs[i].id, reg_in_dev)) + if(reg_in_dev && !wcscmp(capture_devs[i].id, reg_in_dev)) SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETCURSEL, i + 1, 0); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_ADDSTRING, 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); - if(reg_vin_dev && !lstrcmpW(capture_devs[i].id, reg_vin_dev)) + if(reg_vin_dev && !wcscmp(capture_devs[i].id, reg_vin_dev)) SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_SETCURSEL, i + 1, 0); } diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bfe9a48e94d..bab1546a96c 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -21,9 +21,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 6c574d6f3a0..0d3e1b42396 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -33,7 +33,6 @@ #include <shlwapi.h> #include <shlobj.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "winecfg.h" diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 0c5fcc65ced..d9b29517cd9 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -20,26 +20,16 @@ * */ -#include "config.h" -#include "wine/port.h" - #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> -#include <wine/debug.h> #include <stdio.h> -#include <dirent.h> #include <assert.h> #include <stdlib.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include "winecfg.h" #include "resource.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winecfg); @@ -197,7 +187,7 @@ static DWORD mode_to_id(enum dllmode mode) } /* helper for is_builtin_only */ -static int compare_dll( const void *ptr1, const void *ptr2 ) +static int __cdecl compare_dll( const void *ptr1, const void *ptr2 ) { const char * const *name1 = ptr1; const char * const *name2 = ptr2; diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 151dc486659..ebacab9a943 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,9 +22,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -39,7 +36,6 @@ #include <shlobj.h> #include <shlwapi.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "resource.h" #include "winecfg.h" @@ -744,13 +740,13 @@ static void init_shell_folder_listview_headers(HWND dialog) { listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = szShellFolder; - listColumn.cchTextMax = strlenW(listColumn.pszText); + listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cx = width; SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); listColumn.pszText = szLinksTo; - listColumn.cchTextMax = strlenW(listColumn.pszText); + listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cx = viewRect.right - viewRect.left - width - 1; SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMNW, 1, (LPARAM) &listColumn); diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index c4c05bd186a..58e62e64421 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -34,7 +34,6 @@ #include <limits.h> #include <windows.h> #include <winreg.h> -#include <wine/unicode.h> #include <wine/debug.h> #include <wine/list.h> @@ -623,7 +622,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); + !wcsnicmp(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) { diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 34b194d04a6..0b704210295 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -28,7 +28,6 @@ #include <stdio.h> #include <windows.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "resource.h" @@ -78,7 +77,7 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = TRUE; buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); - if (buf && (bufindex = strchrW(buf, 'x'))) + if (buf && (bufindex = wcschr(buf, 'x'))) { *bufindex++ = 0; @@ -195,7 +194,7 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, width); width = strdupW(def_width); } - else if (atoiW(width) < atoiW(min_width)) + else if (wcstol(width, NULL, 10) < wcstol(min_width, NULL, 10)) { HeapFree(GetProcessHeap(), 0, width); width = strdupW(min_width); @@ -204,16 +203,16 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, height); height = strdupW(def_height); } - else if (atoiW(height) < atoiW(min_height)) + else if (wcstol(height, NULL, 10) < wcstol(min_height, NULL, 10)) { HeapFree(GetProcessHeap(), 0, height); height = strdupW(min_height); } - new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); - strcpyW( new, width ); - strcatW( new, x ); - strcatW( new, height ); + new = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(width) + lstrlenW(height) + 2) * sizeof(WCHAR)); + lstrcpyW( new, width ); + lstrcatW( new, x ); + lstrcatW( new, height ); set_reg_keyW(config_key, explorer_desktopsW, desktop_name, new); set_reg_keyW(config_key, keypathW(explorerW), desktopW, desktop_name); @@ -360,8 +359,8 @@ static void update_font_preview(HWND hDlg) GetObjectW(hfont, sizeof(lf), &lf); - if (strcmpW(lf.lfFaceName, tahomaW) != 0) - strcpyW(lf.lfFaceName, tahomaW); + if (wcscmp(lf.lfFaceName, tahomaW) != 0) + lstrcpyW(lf.lfFaceName, tahomaW); else DeleteObject(hfont); lf.lfHeight = MulDiv(-10, dpi, 72);

1 0

Alexandre Julliard : winecfg: Use mountmgr to manage shell folders.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 01a2b9c6282f9ff5480563cc5e4be12ce2f907a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01a2b9c6282f9ff5480563cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:18:37 2021 +0200 winecfg: Use mountmgr to manage shell folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/drive.c | 52 ++++++++++++++++++++++++++++++++ programs/winecfg/theme.c | 75 +++++----------------------------------------- programs/winecfg/winecfg.h | 2 ++ 3 files changed, 61 insertions(+), 68 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index a5fc3bfd73a..bfe9a48e94d 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -370,3 +370,55 @@ void apply_drive_changes(void) } CloseHandle( mgr ); } + + +void query_shell_folder( const WCHAR *path, char *dest, unsigned int len ) +{ + UNICODE_STRING nt_name; + HANDLE mgr; + + if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return; + + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) + { + CloseHandle( mgr ); + return; + } + DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SHELL_FOLDER, nt_name.Buffer, nt_name.Length, + dest, len, NULL, NULL ); + RtlFreeUnicodeString( &nt_name ); +} + +void set_shell_folder( const WCHAR *path, const char *dest ) +{ + struct mountmgr_shell_folder *ioctl; + UNICODE_STRING nt_name; + HANDLE mgr; + DWORD len; + + if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return; + + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) + { + CloseHandle( mgr ); + return; + } + + len = sizeof(*ioctl) + nt_name.Length; + if (dest) len += strlen(dest) + 1; + + if (!(ioctl = HeapAlloc( GetProcessHeap(), 0, len ))) return; + ioctl->folder_offset = sizeof(*ioctl); + ioctl->folder_size = nt_name.Length; + memcpy( (char *)ioctl + ioctl->folder_offset, nt_name.Buffer, nt_name.Length ); + if (dest) + { + ioctl->symlink_offset = ioctl->folder_offset + ioctl->folder_size; + strcpy( (char *)ioctl + ioctl->symlink_offset, dest ); + } + else ioctl->symlink_offset = 0; + + DeviceIoControl( mgr, IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER, ioctl, len, NULL, 0, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ioctl ); + RtlFreeUnicodeString( &nt_name ); +} diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b3a3eeed3ba..151dc486659 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -28,12 +28,6 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #define COBJMACROS @@ -765,25 +759,14 @@ static void init_shell_folder_listview_headers(HWND dialog) { /* Reads the currently set shell folder symbol link targets into asfiInfo. */ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; - HRESULT hr; int i; for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; - hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, - SHGFP_TYPE_CURRENT, wszPath); - if (SUCCEEDED(hr)) { - char *pszUnixPath = wine_get_unix_file_name(wszPath); - if (pszUnixPath) { - struct stat statPath; - if (!lstat(pszUnixPath, &statPath) && S_ISLNK(statPath.st_mode)) { - int cLen = readlink(pszUnixPath, asfiInfo[i].szLinkTarget, FILENAME_MAX-1); - if (cLen >= 0) asfiInfo[i].szLinkTarget[cLen] = '\0'; - } - HeapFree(GetProcessHeap(), 0, pszUnixPath); - } - } - } + if (SUCCEEDED( SHGetFolderPathW( NULL, asfiInfo[i].nFolder | CSIDL_FLAG_DONT_VERIFY, NULL, + SHGFP_TYPE_CURRENT, wszPath ))) + query_shell_folder( wszPath, asfiInfo[i].szLinkTarget, FILENAME_MAX ); + } } static void update_shell_folder_listview(HWND dialog) { @@ -904,56 +887,12 @@ static void on_shell_folder_edit_changed(HWND hDlg) { static void apply_shell_folder_changes(void) { WCHAR wszPath[MAX_PATH]; - char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL; int i; - struct stat statPath; - HRESULT hr; for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { - /* Ignore nonexistent link targets */ - if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) - continue; - - hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_CURRENT, wszPath); - if (FAILED(hr)) continue; - - /* Retrieve the corresponding unix path. */ - pszUnixPath = wine_get_unix_file_name(wszPath); - if (!pszUnixPath) continue; - lstrcpyA(szUnixPath, pszUnixPath); - HeapFree(GetProcessHeap(), 0, pszUnixPath); - - /* Derive name for folder backup. */ - lstrcpyA(szBackupPath, szUnixPath); - lstrcatA(szBackupPath, ".winecfg"); - - if (lstat(szUnixPath, &statPath)) continue; - - /* Move old folder/link out of the way. */ - if (S_ISLNK(statPath.st_mode)) { - if (unlink(szUnixPath)) continue; /* Unable to remove link. */ - } else { - if (!*asfiInfo[i].szLinkTarget) { - continue; /* We are done. Old was real folder, as new shall be. */ - } else { - if (rename(szUnixPath, szBackupPath)) { /* Move folder out of the way. */ - continue; /* Unable to move old folder. */ - } - } - } - - /* Create new link/folder. */ - if (*asfiInfo[i].szLinkTarget) { - symlink(asfiInfo[i].szLinkTarget, szUnixPath); - } else { - /* If there's a backup folder, restore it. Else create new folder. */ - if (!lstat(szBackupPath, &statPath) && S_ISDIR(statPath.st_mode)) { - rename(szBackupPath, szUnixPath); - } else { - mkdir(szUnixPath, 0777); - } - } + if (SUCCEEDED( SHGetFolderPathW( NULL, asfiInfo[i].nFolder | CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_CURRENT, wszPath ))) + set_shell_folder( wszPath, asfiInfo[i].szLinkTarget ); } } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index d022cd3d688..17516aa4a14 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -117,6 +117,8 @@ BOOL add_drive(char letter, const char *targetpath, const char *device, const WCHAR *label, DWORD serial, DWORD type); void delete_drive(struct drive *pDrive); void apply_drive_changes(void); +void query_shell_folder( const WCHAR *path, char *dest, unsigned int len ); +void set_shell_folder( const WCHAR *path, const char *dest ); BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath); extern struct drive drives[26]; /* one for each drive letter */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021