Funny, over the last few days I've been preparing some patches for `GdipCreateBitmapFromHICON`. They address the changes you made in `dlls/gdiplus/image.c` but are more comprehensive and include tests. I don't have a problem with the changes you made there, but if you took those out it could avoid one of us having to deal with merge conflicts.