user32: Respect the requested size of NONCLIENTMETRICSW structure.

9711cdbc · Dmitry Timoshkov · Alexandre Julliard · d8ca6972 · 9711cdbc
Commit 9711cdbc authored Oct 11, 2011 by Dmitry Timoshkov Committed by Alexandre Julliard Oct 11, 2011
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

sysparams.c dlls/user32/sysparams.c +12 -2

No files found.
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -1582,11 +1582,21 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
    {
        LPNONCLIENTMETRICSW lpnm = pvParam;

+        if (!lpnm)
+        {
+            ret = FALSE;
+            break;
+        }
+
        if (!spi_loaded[SPI_NONCLIENTMETRICS_IDX]) load_nonclient_metrics();

-        if (lpnm && (lpnm->cbSize == sizeof(NONCLIENTMETRICSW) ||
-                     lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)))
+        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW))
            *lpnm = nonclient_metrics;
+        else if (lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth))
+        {
+            memcpy(lpnm, &nonclient_metrics, FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth));
+            lpnm->cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth);
+        }
        else
            ret = FALSE;
        break;