So in my ongoing quest to get CreateScalableFontResource completed, I believe that I need to refactor gdi32/freetype.c - AddFontToList to expose an interface to allow me to retrieve a Face *. Attached is a series of 4 patches that accomplish what I believe to be a reasonable refactoring of that function.