[PATCH 0/2] MR4383: Misc janitorings

[PATCH 1/2] gdiplus: Remove redundant NULL check before free().

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/gdiplus/image.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 1fe259f6096..d680cff9940 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -3780,9 +3780,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI

IWICMetadataReader_Release(reader);
     }
-
-    if (seen_text)
-        heap_free(seen_text);
+    heap_free(seen_text);

png_add_unit_properties(frame, bitmap);

[PATCH 2/2] sane.ds: Use ARRAY_SIZE instead of open coding it.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/sane.ds/capability.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c
index 349126f6b95..560b670ae4d 100644
--- a/dlls/sane.ds/capability.c
+++ b/dlls/sane.ds/capability.c
@@ -186,7 +186,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability)
                     ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR,
                     ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH, ICAP_SUPPORTEDSIZES };

-    return msg_get_array(pCapability, TWTY_UINT16, supported_caps, sizeof(supported_caps) / sizeof(supported_caps[0]));
+    return msg_get_array(pCapability, TWTY_UINT16, supported_caps, ARRAY_SIZE(supported_caps));
 }

[PATCH 0/2] MR4383: Misc janitorings - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.