Skip to content

Commit 0bbd5c5

Browse files
author
Dmitry Chapyshev
committed
[NtUser] Fix 3 new tests for GET/SET NONCLIENTMETRICS, MINIMIZEDMETRICS, ICONMETRICS
svn path=/trunk/; revision=72648
1 parent 5d2a362 commit 0bbd5c5

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

reactos/win32ss/user/ntuser/sysparams.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,12 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
912912

913913
case SPI_SETNONCLIENTMETRICS:
914914
{
915-
if (!SpiSet(&gspv.ncm, pvParam, sizeof(NONCLIENTMETRICSW), fl))
915+
LPNONCLIENTMETRICSW metrics = (LPNONCLIENTMETRICSW)pvParam;
916+
917+
/* Fixup user's structure size */
918+
metrics->cbSize = sizeof(NONCLIENTMETRICSW);
919+
920+
if (!SpiSet(&gspv.ncm, metrics, sizeof(NONCLIENTMETRICSW), fl))
916921
return 0;
917922

918923
if (fl & SPIF_UPDATEINIFILE)
@@ -949,7 +954,12 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
949954

950955
case SPI_SETMINIMIZEDMETRICS:
951956
{
952-
if (!SpiSet(&gspv.mm, pvParam, sizeof(MINIMIZEDMETRICS), fl))
957+
LPMINIMIZEDMETRICS metrics = (LPMINIMIZEDMETRICS)pvParam;
958+
959+
/* Fixup user's structure size */
960+
metrics->cbSize = sizeof(MINIMIZEDMETRICS);
961+
962+
if (!SpiSet(&gspv.mm, metrics, sizeof(MINIMIZEDMETRICS), fl))
953963
return 0;
954964

955965
gspv.mm.iWidth = max(0, gspv.mm.iWidth);
@@ -975,7 +985,12 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
975985

976986
case SPI_SETICONMETRICS:
977987
{
978-
if (!SpiSet(&gspv.im, pvParam, sizeof(ICONMETRICSW), fl))
988+
LPICONMETRICSW metrics = (LPICONMETRICSW)pvParam;
989+
990+
/* Fixup user's structure size */
991+
metrics->cbSize = sizeof(ICONMETRICSW);
992+
993+
if (!SpiSet(&gspv.im, metrics, sizeof(ICONMETRICSW), fl))
979994
return 0;
980995

981996
if (fl & SPIF_UPDATEINIFILE)

0 commit comments

Comments
 (0)