March 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : widl: Generate typedefs for namespaced struct / enum types.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 2a7940c97d4e6cd2adace1acb0ca163f12a0da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a7940c97d4e6cd2adace1ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 18:20:47 2021 +0100 widl: Generate typedefs for namespaced struct / enum types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a5e5d6c6fb3..1a69b298e7d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -872,11 +872,25 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, int declonly) { - type_t *t = type_alias_get_aliasee_type(type); - if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) return; - fprintf(header, "typedef "); - write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); - fprintf(header, ";\n"); + type_t *t = type_alias_get_aliasee_type(type); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + { + fprintf(header, "#ifdef __cplusplus\n"); + write_namespace_start(header, t->namespace); + indent(header, 0); + } + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); + fprintf(header, ";\n"); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + { + write_namespace_end(header, t->namespace); + fprintf(header, "#else /* __cplusplus */\n"); + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->c_name, NAME_C); + fprintf(header, ";\n"); + fprintf(header, "#endif /* __cplusplus */\n\n"); + } } int is_const_decl(const var_t *var)

1 0

Nikolay Sivov : mfreadwrite/reader: Enable DXGI device manager path.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 016fe6af18403c046c60b5518a9187c79c281dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=016fe6af18403c046c60b551… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:04:48 2021 +0300 mfreadwrite/reader: Enable DXGI device manager path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 7cb7e1e40eb..2819b800eb9 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1643,12 +1643,6 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader if (!(reader->flags & SOURCE_READER_HAS_DEVICE_MANAGER)) return S_OK; - if (reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) - { - FIXME("DXGI device manager is not supported.\n"); - return S_OK; - } - if (!stream->allocator) { if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&stream->allocator)))

1 0

Nikolay Sivov : dwrite: Use D3DCOLORVALUE equivalent to avoid nameless unions.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 183394cd862b47461475fa90dad190f8233dccbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=183394cd862b47461475fa90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:07:12 2021 +0300 dwrite: Use D3DCOLORVALUE equivalent to avoid nameless unions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 - dlls/dwrite/opentype.c | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index e975812eae5..8b612989386 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -2,7 +2,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite IMPORTS = user32 gdi32 advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ analyzer.c \ diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 6e5624c622a..8d6133545a2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2858,6 +2858,13 @@ HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *cpal, unsigned unsigned int num_palettes, num_palette_entries, i; const struct cpal_color_record *records; const struct cpal_header_0 *header; + struct d3d_color + { + float r; + float g; + float b; + float a; + } *colors = (void *)entries; header = table_read_ensure(cpal, 0, sizeof(*header)); @@ -2883,11 +2890,12 @@ HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *cpal, unsigned first_entry_index += GET_BE_WORD(header->color_record_indices[palette]); - for (i = 0; i < entry_count; i++) { - entries[i].u1.r = records[first_entry_index + i].red / 255.0f; - entries[i].u2.g = records[first_entry_index + i].green / 255.0f; - entries[i].u3.b = records[first_entry_index + i].blue / 255.0f; - entries[i].u4.a = records[first_entry_index + i].alpha / 255.0f; + for (i = 0; i < entry_count; ++i) + { + colors[i].r = records[first_entry_index + i].red / 255.0f; + colors[i].g = records[first_entry_index + i].green / 255.0f; + colors[i].b = records[first_entry_index + i].blue / 255.0f; + colors[i].a = records[first_entry_index + i].alpha / 255.0f; } return S_OK;

1 0

Arkadiusz Hiler : dinput: Implement device creation using product GUID.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 0a82d891fc0b5b7f8b176e5e52d8858bab8d28bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a82d891fc0b5b7f8b176e5e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 23 20:00:36 2021 +0200 dinput: Implement device creation using product GUID. This fixes Far Cry Primal controller discovery. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 10 ++++++++++ dlls/dinput/joystick_linuxinput.c | 10 ++++++++++ dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ dlls/dinput/tests/device.c | 22 ++++++++++++++++++++++ 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 2eab4d3a33d..f9b89d2d70c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -717,7 +717,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; @@ -761,7 +761,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2b26eb806d3..79a077a027c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -598,6 +598,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -608,6 +609,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + for(i = 0; i < joystick_devices_count; i++) + if(IsEqualGUID(&joystick_devices[i].guid_product, guid)) return i; + return MAX_JOYSTICKS; } @@ -790,6 +794,9 @@ static HRESULT WINAPI JoystickLinuxAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A ifa fill_joystick_dideviceinstanceA( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -806,6 +813,9 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W ifa fill_joystick_dideviceinstanceW( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 102de8269b9..f0d2e0dc32b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -612,6 +612,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_Base_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -622,6 +623,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3 - DInput_Wine_Joystick_Base_GUID.Data3; + for(i = 0; i < have_joydevs; i++) + if(IsEqualGUID(&joydevs[i].guid_product, guid)) return i; + return MAX_JOYDEV; } @@ -1450,6 +1454,9 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, fill_joystick_dideviceinstanceA(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -1467,6 +1474,9 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, fill_joystick_dideviceinstanceW(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 805b75639fe..e27357efb32 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1322,6 +1322,10 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_OsX_Joystick_GUID; GUID dev_guid = *guid; + GUID prod_guid = *guid; + IOHIDDeviceRef device; + int joystick_devices_count; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -1332,6 +1336,18 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + prod_guid.Data1 = 0; + if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + { + joystick_devices_count = find_joystick_devices(); + for(i = 0; i < joystick_devices_count; i++) + { + device = get_device_ref(i); + if(guid->Data1 == make_vid_pid(device)) + return i; + } + } + return 0xffff; } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index dcf8a373348..fd212bf2514 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -197,12 +197,14 @@ struct enum_data { IDirectInputA *pDI; HWND hwnd; + BOOL tested_product_creation; }; static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { struct enum_data *data = pvRef; IDirectInputDeviceA *device, *obj = NULL; + DIDEVICEINSTANCEA ddi2; HRESULT hr; hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); @@ -226,6 +228,24 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) IUnknown_Release(obj); IUnknown_Release(device); + + if (!IsEqualGUID(&lpddi->guidInstance, &lpddi->guidProduct)) + { + data->tested_product_creation = TRUE; + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidProduct, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + + ddi2.dwSize = sizeof(ddi2); + hr = IDirectInputDevice_GetDeviceInfo(device, &ddi2); + ok(SUCCEEDED(hr), "IDirectInput_GetDeviceInfo failed: %08x\n", hr); + + ok(IsEqualGUID(&lpddi->guidProduct, &ddi2.guidProduct), "Product GUIDs do not match. Expected %s, got %s\n", debugstr_guid(&lpddi->guidProduct), debugstr_guid(&ddi2.guidProduct)); + ok(IsEqualGUID(&ddi2.guidProduct, &ddi2.guidInstance), "Instance GUID should equal product GUID. Expected %s, got %s\n", debugstr_guid(&ddi2.guidProduct), debugstr_guid(&ddi2.guidInstance)); + /* we cannot compare guidInstances as we may get a different device */ + + IUnknown_Release(device); + } + } return DIENUM_CONTINUE; } @@ -263,9 +283,11 @@ static void device_tests(void) data.pDI = pDI; data.hwnd = hwnd; + data.tested_product_creation = FALSE; hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %08x\n", hr); + if (!data.tested_product_creation) winetest_skip("Device creation using product GUID not tested\n"); /* If GetDeviceStatus returns DI_OK the device must exist */ hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick);

1 0

Nikolay Sivov : gdiplus/metafile: Implement FillPie() recording.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 9b04f1c660806d2b5babc19d3c0ec017f1c8b40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b04f1c660806d2b5babc19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:08:12 2021 +0300 gdiplus/metafile: Implement FillPie() recording. Signed-off-by: Nikolay Sivov <nsivov(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 | 10 ++++++++ dlls/gdiplus/metafile.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a617ca4803e..b0e4d967894 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -113,6 +113,8 @@ extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2c18ced3e92..922c6591c87 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4402,6 +4402,7 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, { GpStatus stat; GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height, startAngle, sweepAngle); @@ -4412,6 +4413,15 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + { + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + return METAFILE_FillPie((GpMetafile *)graphics->image, brush, &rect, startAngle, sweepAngle); + } + stat = GdipCreatePath(FillModeAlternate, &path); if (stat == Ok) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index eafcdaee963..a483b3a5e6d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4896,6 +4896,59 @@ GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rec return Ok; } +GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) +{ + BOOL is_int_rect, inline_color; + EmfPlusFillPie *record; + DWORD brush_id = -1; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + inline_color = brush->bt == BrushTypeSolidColor; + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) return stat; + } + + is_int_rect = is_integer_rect(rect); + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusFillPie, RectData) + + is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), (void **)&record); + if (stat != Ok) return stat; + record->Header.Type = EmfPlusRecordTypeFillPie; + if (inline_color) + { + record->Header.Flags = 0x8000; + record->BrushId = ((GpSolidFill *)brush)->color; + } + else + record->BrushId = brush_id; + + record->StartAngle = startAngle; + record->SweepAngle = sweepAngle; + + if (is_int_rect) + { + record->Header.Flags |= 0x4000; + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + return Ok; +} + static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *font, DWORD *id) { EmfPlusObject *object_record;

1 0

Nikolay Sivov : gdiplus: Forward GdipDrawRectangle() to GdipDrawRectangles().
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 41651d2e1665f3ec42f7afea4b4cbd919abb2885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41651d2e1665f3ec42f7afea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:08:13 2021 +0300 gdiplus: Forward GdipDrawRectangle() to GdipDrawRectangles(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 23 +++++------------ dlls/gdiplus/tests/metafile.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 922c6591c87..4ee0430051f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4088,26 +4088,15 @@ GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - GpStatus status; - GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - status = GdipCreatePath(FillModeAlternate, &path); - if (status != Ok) return status; - - status = GdipAddPathRectangle(path, x, y, width, height); - if (status == Ok) - status = GdipDrawPath(graphics, pen, path); - - GdipDeletePath(path); - return status; + rect.X = x; + rect.Y = y, + rect.Width = width; + rect.Height = height; + return GdipDrawRectangles(graphics, pen, &rect, 1); } GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 410e9a6ab8c..92c738f5116 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3650,6 +3650,63 @@ static void test_fillellipse(void) expect(Ok, stat); } +static const emfplus_record draw_rectangle_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypePen << 8 }, + { EmfPlusRecordTypeDrawRects, 0x4000 }, + { EMR_SAVEDC, 0, 1 }, + { EMR_SETICMMODE, 0, 1 }, + { EMR_BITBLT, 0, 1 }, + { EMR_RESTOREDC, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawrectangle(void) +{ + static const GpRectF frame = { 0.0f, 0.0f, 100.0f, 100.0f }; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawRectangle(graphics, pen, 1.0f, 1.0f, 16.0f, 32.0f); + expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_rectangle.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_rectangle_records, "draw rectangle"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3706,6 +3763,7 @@ START_TEST(metafile) test_printer_dc(); test_drawellipse(); test_fillellipse(); + test_drawrectangle(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Add a helper to initialize RectF.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: beefe76c6f1b9e7f2c0a6fda0b613cb46058d158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beefe76c6f1b9e7f2c0a6fda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:08:14 2021 +0300 gdiplus: Add a helper to initialize RectF. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 6 +--- dlls/gdiplus/gdiplus_private.h | 8 +++++ dlls/gdiplus/graphics.c | 74 +++++++++--------------------------------- dlls/gdiplus/graphicspath.c | 29 +++++++---------- dlls/gdiplus/matrix.c | 5 +-- dlls/gdiplus/metafile.c | 10 ++---- dlls/gdiplus/region.c | 12 ++----- 7 files changed, 40 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beefe76c6f1b9e7f2c0a…

1 0

Nikolay Sivov : gdiplus/metafile: Implement DrawArc() recording.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: c17cd0fcabeb644d256d616cf0fab85f2d9bb4c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17cd0fcabeb644d256d616c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:08:15 2021 +0300 gdiplus/metafile: Implement DrawArc() recording. Signed-off-by: Nikolay Sivov <nsivov(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 | 7 +++++++ dlls/gdiplus/metafile.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f777595e810..25672530313 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -115,6 +115,8 @@ extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRec extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9d16d7c3cdb..e292afdfb2c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2595,6 +2595,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, { GpStatus status; GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -2605,6 +2606,12 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + { + set_rect(&rect, x, y, width, height); + return METAFILE_DrawArc((GpMetafile *)graphics->image, pen, &rect, startAngle, sweepAngle); + } + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 06d1a9ccbf4..41950eb31c7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -5205,3 +5205,49 @@ GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF return Ok; } + +GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, REAL startAngle, REAL sweepAngle) +{ + EmfPlusDrawArc *record; + GpStatus stat; + BOOL integer_rect; + DWORD pen_id; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + integer_rect = is_integer_rect(rect); + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawArc, RectData) + + integer_rect ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF), + (void **)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeDrawArc; + record->Header.Flags = pen_id; + if (integer_rect) + record->Header.Flags |= 0x4000; + record->StartAngle = startAngle; + record->SweepAngle = sweepAngle; + + if (integer_rect) + { + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + + return Ok; +}

1 0

Roman Pišl : kernel32/tests: Add test for FileRenameInfo in SetFileInformationByHandle.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 0f84d30753f5fa257f47c76a124f6cb9cd75f1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f84d30753f5fa257f47c76a… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Mar 23 15:16:39 2021 +0100 kernel32/tests: Add test for FileRenameInfo in SetFileInformationByHandle. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 6ea9dffde5c..f2254d4e988 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5284,6 +5284,77 @@ todo_wine CloseHandle(file); } +static void test_SetFileRenameInfo(void) +{ + WCHAR tempFileFrom[MAX_PATH], tempFileTo1[MAX_PATH], tempFileTo2[MAX_PATH]; + WCHAR tempPath[MAX_PATH]; + FILE_RENAME_INFORMATION *fri; + HANDLE file; + DWORD size; + BOOL ret; + + if (!pSetFileInformationByHandle) + { + win_skip("SetFileInformationByHandle is not supported\n"); + return; + } + + ret = GetTempPathW(MAX_PATH, tempPath); + ok(ret, "GetTempPathW failed, got error %u.\n", GetLastError()); + + ret = GetTempFileNameW(tempPath, L"abc", 0, tempFileFrom); + ok(ret, "GetTempFileNameW failed, got error %u.\n", GetLastError()); + + ret = GetTempFileNameW(tempPath, L"abc", 0, tempFileTo1); + ok(ret, "GetTempFileNameW failed, got error %u.\n", GetLastError()); + + ret = GetTempFileNameW(tempPath, L"abc", 1, tempFileTo2); + ok(ret, "GetTempFileNameW failed, got error %u.\n", GetLastError()); + + file = CreateFileW(tempFileFrom, GENERIC_READ | GENERIC_WRITE | DELETE, 0, 0, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create temp file, error %u.\n", GetLastError()); + + size = sizeof(FILE_RENAME_INFORMATION) + MAX_PATH; + fri = HeapAlloc(GetProcessHeap(), 0, size); + + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; + fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); + memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); + ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); +todo_wine + ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, "FileRenameInfo unexpected result %d\n", GetLastError()); + + fri->ReplaceIfExists = TRUE; + ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); +todo_wine + ok(ret, "FileRenameInfo failed, error %d\n", GetLastError()); + + fri->ReplaceIfExists = FALSE; + fri->FileNameLength = wcslen(tempFileTo2) * sizeof(WCHAR); + memcpy(fri->FileName, tempFileTo2, fri->FileNameLength + sizeof(WCHAR)); + ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); +todo_wine + ok(ret, "FileRenameInfo failed, error %d\n", GetLastError()); + CloseHandle(file); + + file = CreateFileW(tempFileTo2, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); +todo_wine + ok(file != INVALID_HANDLE_VALUE, "file not renamed, error %d\n", GetLastError()); + + fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); + memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); + ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); +todo_wine + ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, "FileRenameInfo unexpected result %d\n", GetLastError()); + CloseHandle(file); + + HeapFree(GetProcessHeap(), 0, fri); + DeleteFileW(tempFileFrom); + DeleteFileW(tempFileTo1); + DeleteFileW(tempFileTo2); +} + static void test_GetFileAttributesExW(void) { static const WCHAR path1[] = {'\\','\\','?','\\',0}; @@ -5846,6 +5917,7 @@ START_TEST(file) test_GetFinalPathNameByHandleA(); test_GetFinalPathNameByHandleW(); test_SetFileInformationByHandle(); + test_SetFileRenameInfo(); test_GetFileAttributesExW(); test_post_completion(); test_overlapped_read();

1 0

Roman Pišl : kernelbase: Convert DOS to NT path for FileRenameInfo in SetFileInformationByHandle.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 33c6a6cb285800cac60ceab5868122fa8d9cda92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c6a6cb285800cac60ceab5… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Mar 23 15:16:40 2021 +0100 kernelbase: Convert DOS to NT path for FileRenameInfo in SetFileInformationByHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50756 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ---- dlls/kernelbase/file.c | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f2254d4e988..5deed96abf3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5322,24 +5322,20 @@ static void test_SetFileRenameInfo(void) fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, "FileRenameInfo unexpected result %d\n", GetLastError()); fri->ReplaceIfExists = TRUE; ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine ok(ret, "FileRenameInfo failed, error %d\n", GetLastError()); fri->ReplaceIfExists = FALSE; fri->FileNameLength = wcslen(tempFileTo2) * sizeof(WCHAR); memcpy(fri->FileName, tempFileTo2, fri->FileNameLength + sizeof(WCHAR)); ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine ok(ret, "FileRenameInfo failed, error %d\n", GetLastError()); CloseHandle(file); file = CreateFileW(tempFileTo2, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); -todo_wine ok(file != INVALID_HANDLE_VALUE, "file not renamed, error %d\n", GetLastError()); fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 23a36b0a765..e0a75c2ad08 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3556,8 +3556,27 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break; case FileRenameInfo: - status = NtSetInformationFile( file, &io, info, size, FileRenameInformation ); - break; + { + FILE_RENAME_INFORMATION *rename_info; + UNICODE_STRING nt_name; + ULONG size; + + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( ((FILE_RENAME_INFORMATION *)info)->FileName, + &nt_name, NULL, NULL ))) + break; + + size = sizeof(*rename_info) + nt_name.Length; + if ((rename_info = HeapAlloc( GetProcessHeap(), 0, size ))) + { + memcpy( rename_info, info, sizeof(*rename_info) ); + memcpy( rename_info->FileName, nt_name.Buffer, nt_name.Length + sizeof(WCHAR) ); + rename_info->FileNameLength = nt_name.Length; + status = NtSetInformationFile( file, &io, rename_info, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, rename_info ); + } + RtlFreeUnicodeString( &nt_name ); + break; + } case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo:

1 0