Fix some software can not normal work
Merge pull request #1622 from zhaohb/fix-gdi

Fix some software can not normal work