wine-commits August 2023

wine-commits@winehq.org

1 participants
667 discussions

Alistair Leslie-Hughes : dmime: Store WAVE data when Loading.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 0774873ea26c11757cdf511943c17ec81c6e11c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0774873ea26c11757cdf511943c17e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 3 16:25:11 2022 +1000 dmime: Store WAVE data when Loading. --- dlls/dmime/segment.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index bf44c5e73b3..c005d506cad 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -33,6 +33,10 @@ typedef struct IDirectMusicSegment8Impl { DMUS_IO_SEGMENT_HEADER header; IDirectMusicGraph *pGraph; struct list Tracks; + + PCMWAVEFORMAT wave_format; + void *wave_data; + int data_size; } IDirectMusicSegment8Impl; IDirectMusicSegment8Impl *create_segment(void); @@ -86,6 +90,9 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { + if (This->wave_data) + free(This->wave_data); + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -818,6 +825,52 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } +static HRESULT parse_wave_form(IDirectMusicSegment8Impl *This, IStream *stream, const struct chunk_entry *riff) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = riff}; + + TRACE("Parsing segment wave in %p: %s\n", stream, debugstr_chunk(riff)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case mmioFOURCC('f','m','t',' '): { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->wave_format, + sizeof(This->wave_format))) ) + return hr; + TRACE("Wave Format tag %d\n", This->wave_format.wf.wFormatTag); + break; + } + case mmioFOURCC('d','a','t','a'): { + TRACE("Wave Data size %lu\n", chunk.size); + if (This->wave_data) + ERR("Multiple data streams detected\n"); + This->wave_data = malloc(chunk.size); + This->data_size = chunk.size; + if (!This->wave_data) + return E_OUTOFMEMORY; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, This->wave_data, chunk.size))) + return hr; + break; + } + case FOURCC_LIST: { + FIXME("Skipping LIST tag\n"); + break; + } + case mmioFOURCC('I','S','F','T'): { + FIXME("Skipping ISFT tag\n"); + break; + } + case mmioFOURCC('f','a','c','t'): { + FIXME("Skipping fact tag\n"); + break; + } + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream) { IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); @@ -847,8 +900,10 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st if (riff.type == DMUS_FOURCC_SEGMENT_FORM) hr = parse_segment_form(This, stream, &riff); + else if(riff.type == mmioFOURCC('W','A','V','E')) + hr = parse_wave_form(This, stream, &riff); else { - FIXME("WAVE form loading not implemented\n"); + FIXME("Unknown type %s\n", debugstr_chunk(&riff)); hr = S_OK; }

1 0

Jeff Smith : gdiplus: Set PNG palette histogram property when present.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: fc78134d5f1bf929fa3ccf9e8ecb57dab7fe985c URL: https://gitlab.winehq.org/wine/wine/-/commit/fc78134d5f1bf929fa3ccf9e8ecb57… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 10:01:59 2023 -0500 gdiplus: Set PNG palette histogram property when present. --- dlls/gdiplus/image.c | 30 +++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4837b4b1a3f..67a7fdfab13 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3620,6 +3620,26 @@ static HRESULT png_read_time(IWICMetadataReader *reader, GpBitmap *bitmap) return S_OK; } +static HRESULT png_read_histogram(IWICMetadataReader *reader, GpBitmap *bitmap) +{ + HRESULT hr; + PropertyItem* item; + PROPVARIANT value; + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); + if (FAILED(hr)) + return hr; + + item = create_prop(PropertyTagPaletteHistogram, &value); + if (item) + add_property(bitmap, item); + heap_free(item); + + PropVariantClear(&value); + + return S_OK; +} + static HRESULT png_add_unit_properties(IWICBitmapFrameDecode *frame, GpBitmap *bitmap) { HRESULT hr; @@ -3675,7 +3695,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; UINT block_count, i; - BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE, seen_time=FALSE; + BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE, seen_time=FALSE, seen_histogram=FALSE; BOOL *seen_text = NULL; hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); @@ -3744,6 +3764,14 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI seen_time = SUCCEEDED(hr); } } + else if (IsEqualGUID(&GUID_MetadataFormatChunkhIST, &format)) + { + if (!seen_histogram) + { + hr = png_read_histogram(reader, bitmap); + seen_histogram = SUCCEEDED(hr); + } + } IWICMetadataReader_Release(reader); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 61579aa9dab..0baf6eae77b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5813,6 +5813,14 @@ static const BYTE png_time[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +static const BYTE png_hist[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde, + 0x00,0x00,0x00,0x08,'h','I','S','T',0x00,0x01,0x00,0x02,0x00,0x03,0x00,0x04,0xff,0xff,0xff,0xff, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + static void test_png_unit_properties(void) { GpImage *image; @@ -5913,6 +5921,30 @@ static void test_png_datetime_property(void) GdipDisposeImage(image); } +static void test_png_histogram_property(void) +{ + struct property_test_data td[] = + { + { PropertyTagTypeShort, PropertyTagPaletteHistogram, 8, { 1,0,2,0,3,0,4,0 } }, + { PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0,0,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0,0,0,0 } }, + }; + + GpImage *image = load_image(png_hist, sizeof(png_hist), TRUE, FALSE); + if (!image) + { + win_skip("broken PNG histogram support\n"); + return; + } + + winetest_push_context("%s", __FUNCTION__); + check_properties_get_all(image, td, ARRAY_SIZE(td), NULL, 0, ~0); + winetest_pop_context(); + + GdipDisposeImage(image); +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -6159,6 +6191,7 @@ START_TEST(image) test_png_save_palette(); test_png_unit_properties(); test_png_datetime_property(); + test_png_histogram_property(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion();

1 0

Jeff Smith : gdiplus: Set PNG date-time property when present.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 78e6a53d678d057ea948f38973c0f9e99469d585 URL: https://gitlab.winehq.org/wine/wine/-/commit/78e6a53d678d057ea948f38973c0f9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 22:49:15 2023 -0500 gdiplus: Set PNG date-time property when present. --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 33 ++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 599f576ca4d..4837b4b1a3f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3577,6 +3577,49 @@ static HRESULT png_read_chromaticity(IWICMetadataReader *reader, GpBitmap *bitma return S_OK; } +static HRESULT png_read_time(IWICMetadataReader *reader, GpBitmap *bitmap) +{ + HRESULT hr; + UINT item_size, i; + PropertyItem* item; + PROPVARIANT value; + USHORT datetime[6]; + + for (i = 0; i < 6; i++) + { + hr = IWICMetadataReader_GetValueByIndex(reader, i, NULL, NULL, &value); + if (FAILED(hr)) + return hr; + if (i == 0 && value.vt == VT_UI2) + datetime[0] = value.uiVal; + else if (i > 0 && value.vt == VT_UI1) + datetime[i] = value.bVal; + else + { + PropVariantClear(&value); + return E_FAIL; + } + PropVariantClear(&value); + } + + item_size = 20; + item = heap_alloc_zero(sizeof(*item) + item_size); + if (!item) + return E_OUTOFMEMORY; + + item->id = PropertyTagDateTime; + item->type = PropertyTagTypeASCII; + item->length = item_size; + item->value = item + 1; + snprintf(item->value, item_size, "%04u:%02u:%02u %02u:%02u:%02u", + datetime[0], datetime[1], datetime[2], datetime[3], datetime[4], datetime[5]); + + add_property(bitmap, item); + heap_free(item); + + return S_OK; +} + static HRESULT png_add_unit_properties(IWICBitmapFrameDecode *frame, GpBitmap *bitmap) { HRESULT hr; @@ -3632,7 +3675,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; UINT block_count, i; - BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE; + BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE, seen_time=FALSE; BOOL *seen_text = NULL; hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); @@ -3693,6 +3736,14 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI seen_chrm = SUCCEEDED(hr); } } + else if (IsEqualGUID(&GUID_MetadataFormatChunktIME, &format)) + { + if (!seen_time) + { + hr = png_read_time(reader, bitmap); + seen_time = SUCCEEDED(hr); + } + } IWICMetadataReader_Release(reader); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1e57a736245..61579aa9dab 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3880,7 +3880,7 @@ static void test_image_properties(void) status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "GdipGetPropertyCount error %d\n", status); - todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage) + todo_wine_if(td[i].image_data == jpgimage) ok(td[i].prop_count == prop_count || (td[i].prop_count2 != ~0 && td[i].prop_count2 == prop_count), "expected property count %u or %u, got %u\n", td[i].prop_count, td[i].prop_count2, prop_count); @@ -5805,6 +5805,14 @@ static const BYTE png_phys[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +static const BYTE png_time[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde, + 0x00,0x00,0x00,0x07,'t','I','M','E',0x07,0xb2,0x01,0x01,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + static void test_png_unit_properties(void) { GpImage *image; @@ -5883,6 +5891,28 @@ static void test_png_unit_properties(void) } } +static void test_png_datetime_property(void) +{ + struct property_test_data td[] = + { + { PropertyTagTypeASCII, PropertyTagDateTime, 20, { "1970:01:01 00:00:00" } }, + { PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0,0,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0,0,0,0 } }, + }; + + GpImage *image = load_image(png_time, sizeof(png_time), TRUE, FALSE); + ok(image != NULL, "Failed to load PNG image data\n"); + if (!image) + return; + + winetest_push_context("%s", __FUNCTION__); + check_properties_get_all(image, td, ARRAY_SIZE(td), td, 1, ~0); + winetest_pop_context(); + + GdipDisposeImage(image); +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -6128,6 +6158,7 @@ START_TEST(image) test_png_color_formats(); test_png_save_palette(); test_png_unit_properties(); + test_png_datetime_property(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion();

1 0

Jeff Smith : gdiplus: Set PNG unit properties always.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 40d6b4a18bb611341b01b1df86ce16303c83708b URL: https://gitlab.winehq.org/wine/wine/-/commit/40d6b4a18bb611341b01b1df86ce16… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 11:25:13 2023 -0500 gdiplus: Set PNG unit properties always. --- dlls/gdiplus/image.c | 51 ++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 96 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bef2a336986..599f576ca4d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3577,6 +3577,55 @@ static HRESULT png_read_chromaticity(IWICMetadataReader *reader, GpBitmap *bitma return S_OK; } +static HRESULT png_add_unit_properties(IWICBitmapFrameDecode *frame, GpBitmap *bitmap) +{ + HRESULT hr; + double dpiX, dpiY; + PropertyItem *unit, *unitX, *unitY; + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpiX, &dpiY); + if (FAILED(hr)) + return hr; + + unit = heap_alloc_zero(sizeof(*unit) + 1); + unitX = heap_alloc_zero(sizeof(*unitX) + 4); + unitY = heap_alloc_zero(sizeof(*unitY) + 4); + + if (!unit || !unitX || !unitY) + { + heap_free(unit); + heap_free(unitX); + heap_free(unitY); + return E_OUTOFMEMORY; + } + + unit->type = PropertyTagTypeByte; + unit->id = PropertyTagPixelUnit; + unit->length = 1; + unit->value = unit + 1; + *(BYTE *)unit->value = 1; + add_property(bitmap, unit); + heap_free(unit); + + unitX->type = PropertyTagTypeLong; + unitX->id = PropertyTagPixelPerUnitX; + unitX->length = 4; + unitX->value = unitX + 1; + *(ULONG *)unitX->value = (dpiX == 96.0) ? 0 : gdip_round(dpiX / 0.0254); + add_property(bitmap, unitX); + heap_free(unitX); + + unitY->type = PropertyTagTypeLong; + unitY->id = PropertyTagPixelPerUnitY; + unitY->length = 4; + unitY->value = unitY + 1; + *(ULONG *)unitY->value = (dpiY == 96.0) ? 0 : gdip_round(dpiY / 0.0254); + add_property(bitmap, unitY); + heap_free(unitY); + + return S_OK; +} + static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) { HRESULT hr; @@ -3651,6 +3700,8 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (seen_text) heap_free(seen_text); + png_add_unit_properties(frame, bitmap); + IWICMetadataBlockReader_Release(block_reader); IWICBitmapFrameDecode_Release(frame); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b0ea5460d9e..1e57a736245 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3768,7 +3768,7 @@ static void check_properties_get_all(GpImage *image, const struct property_test_ total_count = 0xdeadbeef; status = GdipGetPropertySize(image, &total_size, &total_count); expect(Ok, status); - ok(prop_size == total_size, + ok(prop_size == total_size || prop_size == ~0, "expected total property size %u, got %u\n", prop_size, total_size); ok(count == total_count || broken(count_broken != ~0 && count_broken == total_count), "expected total property count %u, got %u\n", count, total_count); @@ -5790,6 +5790,99 @@ static void test_png_save_palette(void) GlobalFree(hglob); } +static const BYTE png_minimal[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static const BYTE png_phys[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde, + 0x00,0x00,0x00,0x09,'p','H','Y','s',0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_unit_properties(void) +{ + GpImage *image; + UINT pHYs_off = 0, i; + static const struct { + BYTE unit; + ULONG unitX; + ULONG unitY; + } td[] = + { + {}, + {1, 0, 0}, + {0, 1000, 1000}, + {1, 1000, 1000}, + {1, 3780, 3780}, + }; + struct property_test_data prop_td[][3] = + { + {{ PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0,0,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0,0,0,0 } }}, + {{ PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0,0,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0,0,0,0 } }}, + {{ PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 }, FALSE, TRUE }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0,0,0,0 }, FALSE, TRUE }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0,0,0,0 }, FALSE, TRUE }}, + {{ PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0xe8,0x03,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0xe8,0x03,0,0 } }}, + {{ PropertyTagTypeByte, PropertyTagPixelUnit, 1, { 1 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitX, 4, { 0xc4,0x0e,0,0 } }, + { PropertyTagTypeLong, PropertyTagPixelPerUnitY, 4, { 0xc4,0x0e,0,0 } }}, + }; + BYTE buf[sizeof(png_phys)]; + + + for (i = 0; i < sizeof(png_phys) - 4; i++) + { + if (!memcmp(png_phys + i, "pHYs", 4)) + pHYs_off = i; + } + + ok(pHYs_off, "pHYs offset %d\n", pHYs_off); + if (!pHYs_off) + return; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (i == 0) + image = load_image(png_minimal, sizeof(png_minimal), TRUE, FALSE); + else + { + memcpy(buf, png_phys, sizeof(png_phys)); + buf[pHYs_off + 4] = (td[i].unitX >> 24) & 0xff; + buf[pHYs_off + 5] = (td[i].unitX >> 16) & 0xff; + buf[pHYs_off + 6] = (td[i].unitX >> 8) & 0xff; + buf[pHYs_off + 7] = td[i].unitX & 0xff; + buf[pHYs_off + 8] = (td[i].unitY >> 24) & 0xff; + buf[pHYs_off + 9] = (td[i].unitY >> 16) & 0xff; + buf[pHYs_off + 10] = (td[i].unitY >> 8) & 0xff; + buf[pHYs_off + 11] = td[i].unitY & 0xff; + buf[pHYs_off + 12] = td[i].unit; + image = load_image(buf, sizeof(buf), TRUE, FALSE); + } + + ok(image != NULL, "%u: Failed to load PNG image data\n", i); + if (!image) + continue; + + winetest_push_context("%s test %u", __FUNCTION__, i); + check_properties_get_all(image, prop_td[i], 3, NULL, 0, ~0); + winetest_pop_context(); + + GdipDisposeImage(image); + } +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -6034,6 +6127,7 @@ START_TEST(image) test_GdipInitializePalette(); test_png_color_formats(); test_png_save_palette(); + test_png_unit_properties(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion();

1 0

Jeff Smith : gdiplus: Refactor png_metadata_reader.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: c171fbc01f5646bacf7c892bf0cc92bf9fee286a URL: https://gitlab.winehq.org/wine/wine/-/commit/c171fbc01f5646bacf7c892bf0cc92… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 09:59:14 2023 -0500 gdiplus: Refactor png_metadata_reader. --- dlls/gdiplus/image.c | 294 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 174 insertions(+), 120 deletions(-)

1 0

Jeff Smith : gdiplus/tests: Factor out check_properties functions.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: f9c653a811207edf4ab223bc766b6869a0be6c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9c653a811207edf4ab223bc766b68… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 24 14:36:30 2023 -0500 gdiplus/tests: Factor out check_properties functions. --- dlls/gdiplus/tests/image.c | 448 ++++++++++++++++++--------------------------- 1 file changed, 180 insertions(+), 268 deletions(-)

1 0

Jeff Smith : ddraw/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 287eb4e84b19585d14caf0bd150f77712e8b0079 URL: https://gitlab.winehq.org/wine/wine/-/commit/287eb4e84b19585d14caf0bd150f77… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 30 21:50:22 2023 -0500 ddraw/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/ddraw/tests/ddraw1.c | 19 ++++++++----------- dlls/ddraw/tests/ddraw2.c | 19 ++++++++----------- dlls/ddraw/tests/ddraw4.c | 19 ++++++++----------- dlls/ddraw/tests/ddraw7.c | 19 ++++++++----------- 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cde80c58e99..6c57eb4470c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -50,6 +50,13 @@ struct create_window_thread_param HANDLE thread; }; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -60,10 +67,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) @@ -74,13 +78,6 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 86056014f96..98737f36541 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -51,6 +51,13 @@ struct create_window_thread_param HANDLE thread; }; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -61,10 +68,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) @@ -75,13 +79,6 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4458cea5145..bc465332694 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -57,6 +57,13 @@ struct create_window_thread_param HANDLE thread; }; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -67,10 +74,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) @@ -81,13 +85,6 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bbb78169aea..917720d9802 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -68,6 +68,13 @@ struct create_window_thread_param HANDLE thread; }; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -78,10 +85,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec3(struct vec3 *vec, float x, float y, float z, unsigned int ulps) @@ -99,13 +103,6 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff)

1 0

Zebediah Figura : wined3d: Implement a copy-on-write scheme for whole buffer uploads.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: c6b9aa7a7c44a97fccc5b5270e90786dfac1eb83 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6b9aa7a7c44a97fccc5b5270e9078… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 18 00:31:02 2023 -0500 wined3d: Implement a copy-on-write scheme for whole buffer uploads. For discard maps on deferred contexts, we currently blit from the upload buffer to the resource. This is necessary because command lists can be reused and submitted multiple times—we cannot simply have the buffer take ownership, as for discard maps on immediate contexts. However, it is very common for applications to use command lists only once before throwing them away—in essence taking advantage of the feature only for the multithreading advantages it allows. Therefore we take advantage of this pattern by trying to rename the buffer anyway. In order to do this we introduce a refcount for BO pointers. When writing to a buffer BO, we first check whether the buffer "owns" the BO—i.e. whether it has a refcount of 1—and if not, we create a new BO for the buffer and copy the contents of the old BO to the new BO. That is, we perform mostly-transparent copy-on-write. This improves performance, and reduces CPU usage, in Assassin's Creed: Unity. --- dlls/wined3d/buffer.c | 87 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context_gl.c | 3 ++ dlls/wined3d/context_vk.c | 5 +++ dlls/wined3d/cs.c | 7 +++- dlls/wined3d/device.c | 1 + dlls/wined3d/view.c | 10 +++++ dlls/wined3d/wined3d_private.h | 7 ++++ 7 files changed, 109 insertions(+), 11 deletions(-)

1 0

Zebediah Figura : wined3d: Separate a wined3d_context_vk_load_buffers() helper.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: de7164910243c2114545d1c263c1bafa22b1bff3 URL: https://gitlab.winehq.org/wine/wine/-/commit/de7164910243c2114545d1c263c1ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 26 17:14:44 2023 -0500 wined3d: Separate a wined3d_context_vk_load_buffers() helper. Mostly just because wined3d_context_vk_apply_draw_state() is large and it's nice to split it up a bit. --- dlls/wined3d/context_vk.c | 98 ++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 932d2f5aa77..efc93b94539 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3388,6 +3388,59 @@ static VkPipeline wined3d_context_vk_get_graphics_pipeline(struct wined3d_contex return pipeline_vk->vk_pipeline; } +static void wined3d_context_vk_load_buffers(struct wined3d_context_vk *context_vk, + const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk, bool indexed) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_buffer *buffer; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (!(buffer = state->streams[i].buffer)) + continue; + + buffer_vk = wined3d_buffer_vk(buffer); + wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); + wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_VERTEX_BUFFER); + if (!buffer_vk->b.bo_user.valid) + context_invalidate_state(&context_vk->c, STATE_STREAMSRC); + } + + if (use_transform_feedback(state) && vk_info->supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) + { + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + if (!(buffer = state->stream_output[i].buffer)) + continue; + + buffer_vk = wined3d_buffer_vk(buffer); + wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); + wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_STREAM_OUTPUT); + wined3d_buffer_invalidate_location(&buffer_vk->b, ~WINED3D_LOCATION_BUFFER); + if (!buffer_vk->b.bo_user.valid) + context_vk->update_stream_output = 1; + } + context_vk->c.transform_feedback_active = 1; + } + + if (indexed || (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer)) + { + buffer_vk = wined3d_buffer_vk(state->index_buffer); + wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); + wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_INDEX_BUFFER); + if (!buffer_vk->b.bo_user.valid) + context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); + } + + if (indirect_vk) + { + wined3d_buffer_load(&indirect_vk->b, &context_vk->c, state); + wined3d_buffer_vk_barrier(indirect_vk, context_vk, WINED3D_BIND_INDIRECT_BUFFER); + } +} + static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { @@ -3520,7 +3573,6 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VkSampleCountFlagBits sample_count; VkCommandBuffer vk_command_buffer; unsigned int i, invalidate_rt = 0; - struct wined3d_buffer *buffer; uint32_t null_buffer_binding; bool invalidate_ds = false; @@ -3608,49 +3660,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c wined3d_context_vk_load_shader_resources(context_vk, state, WINED3D_PIPELINE_GRAPHICS); - for (i = 0; i < ARRAY_SIZE(state->streams); ++i) - { - if (!(buffer = state->streams[i].buffer)) - continue; - - buffer_vk = wined3d_buffer_vk(buffer); - wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); - wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_VERTEX_BUFFER); - if (!buffer_vk->b.bo_user.valid) - context_invalidate_state(&context_vk->c, STATE_STREAMSRC); - } - - if (use_transform_feedback(state) && vk_info->supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) - { - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - if (!(buffer = state->stream_output[i].buffer)) - continue; - - buffer_vk = wined3d_buffer_vk(buffer); - wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); - wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_STREAM_OUTPUT); - wined3d_buffer_invalidate_location(&buffer_vk->b, ~WINED3D_LOCATION_BUFFER); - if (!buffer_vk->b.bo_user.valid) - context_vk->update_stream_output = 1; - } - context_vk->c.transform_feedback_active = 1; - } - - if (indexed || (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer)) - { - buffer_vk = wined3d_buffer_vk(state->index_buffer); - wined3d_buffer_load(&buffer_vk->b, &context_vk->c, state); - wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_INDEX_BUFFER); - if (!buffer_vk->b.bo_user.valid) - context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); - } - - if (indirect_vk) - { - wined3d_buffer_load(&indirect_vk->b, &context_vk->c, state); - wined3d_buffer_vk_barrier(indirect_vk, context_vk, WINED3D_BIND_INDIRECT_BUFFER); - } + wined3d_context_vk_load_buffers(context_vk, state, indirect_vk, indexed); if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) {

1 0

Zebediah Figura : wined3d: Remove BO users from the list when invalidating them.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: b2f13103d7d96fc082b91b8e808599836ed4a2b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2f13103d7d96fc082b91b8e808599… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 19:36:54 2023 -0500 wined3d: Remove BO users from the list when invalidating them. This makes it easier to invalidate in the case where multiple resources share the same BO, which in turn is necessary to implement copy-on-write semantics for BOs. This is also necessary if we ever want to evict resources which have views, although it's not clear if this will ever be necessary. If nothing else, though, it removes that implicit dependency. --- dlls/wined3d/adapter_vk.c | 11 +++++------ dlls/wined3d/buffer.c | 26 +++++++++++++------------- dlls/wined3d/context_gl.c | 24 ++++++++++++------------ dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/state.c | 6 +++--- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/view.c | 21 +++++++++++++++++---- dlls/wined3d/wined3d_private.h | 8 ++++++++ 8 files changed, 62 insertions(+), 39 deletions(-)

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
67
Older →

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