ws/gdi: sketch of gdi changes