<div dir="auto">The subject line in this and other patch seem overlong. Make sure you format the subject line correctly and separate it from rest of the commit message by a blank line.</div><br><div class="gmail_quote"><div dir="ltr">On Mon, 6 Aug 2018, 19:47 Rob Walker, <<a href="mailto:bob.mt.wya@gmail.com">bob.mt.wya@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
dlls/winex11.drv/settings.c | 23 +++++++++--------------<br>
1 file changed, 9 insertions(+), 14 deletions(-)<br>
<br>
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c<br>
index afa26cf543..b0164d5806 100644<br>
--- a/dlls/winex11.drv/settings.c<br>
+++ b/dlls/winex11.drv/settings.c<br>
@@ -344,7 +344,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,<br>
{<br>
DWORD i, dwBpp = 0;<br>
DEVMODEW dm;<br>
- BOOL def_mode = TRUE;<br>
+ BOOL def_mode = TRUE, test_bpp, test_frequency;<br>
<br>
TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid);<br>
TRACE("flags=%s\n",_CDS_flags(flags));<br>
@@ -387,29 +387,24 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,<br>
return DISP_CHANGE_BADMODE;<br>
}<br>
<br>
+ test_bpp = devmode->dmFields & DM_BITSPERPEL;<br>
+ test_frequency = (devmode->dmFields & DM_DISPLAYFREQUENCY) &&<br>
+ (devmode->dmDisplayFrequency != 0);<br>
for (i = 0; i < dd_mode_count; i++)<br>
{<br>
- if (devmode->dmFields & DM_BITSPERPEL)<br>
+ if (devmode->dmPelsWidth != dd_modes[i].width) continue;<br>
+ if (devmode->dmPelsHeight != dd_modes[i].height) continue;<br>
+ if (test_bpp)<br>
{<br>
if (dwBpp != dd_modes[i].bpp)<br>
continue;<br>
}<br>
- if (devmode->dmFields & DM_PELSWIDTH)<br>
- {<br>
- if (devmode->dmPelsWidth != dd_modes[i].width)<br>
- continue;<br>
- }<br>
- if (devmode->dmFields & DM_PELSHEIGHT)<br>
- {<br>
- if (devmode->dmPelsHeight != dd_modes[i].height)<br>
- continue;<br>
- }<br>
- if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) &&<br>
- devmode->dmDisplayFrequency != 0)<br>
+ if (test_frequency && (dd_modes[i].refresh_rate != 0))<br>
{<br>
if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate)<br>
continue;<br>
}<br>
+<br>
/* we have a valid mode */<br>
TRACE("Requested display settings match mode %d (%s)\n", i, handler_name);<br>
<br>
-- <br>
2.18.0<br>
<br>
<br>
<br>
</blockquote></div>