The hunks in 3/3 need to be fixed up to 1/3 or 2/3 as appropriate.
Sorry but I don't know what that means. You mean like fix the code down to 2 or 1 commit?
what version of Windows are you seeing vend this class from shell32?
To be honest, I didn't personally check what library provided this class, I just followed some hints, especially [from this bug](https://bugs.winehq.org/show_bug.cgi?id=53620).