[Git][wine/wine][master] 2 commits: comdlg32/tests: Fix compilation for gcc 4.7.