[glib: 11/11] Merge branch 'w32-contenttype' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 9b77b75f2dcd21b7c45e65a49a5667edf14e294b
Merge: 96279325b b0c53559c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Mar 17 15:14:14 2022 +0000

    Merge branch 'w32-contenttype' into 'main'
    
    Various contenttype-related test fixes on win32
    
    See merge request GNOME/glib!2499

 gio/gcontenttype-win32.c | 42 +++++++++++++++++++++++++++++-------------
 gio/tests/contenttype.c  | 29 ++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 20 deletions(-)
---