From 3776d19ec95b936725eb69f6698d1cecac57c111 Mon Sep 17 00:00:00 2001
From: Dmitry Chapyshev <dmitry@reactos.org>
Date: Sat, 10 Sep 2016 16:17:35 +0000
Subject: [PATCH] [WIN32KNT_APITEST] - Remove wrong tests. Win2k3 ignores the
 size of structure for GET/SET NONCLIENTMETRICS, MINIMIZEDMETRICS, ICONMETRICS

[NtUser]
- Remove wrong checks

svn path=/trunk/; revision=72645
---
 reactos/win32ss/user/ntuser/sysparams.c       | 48 -------------------
 .../ntuser/NtUserSystemParametersInfo.c       |  3 --
 2 files changed, 51 deletions(-)

diff --git a/reactos/win32ss/user/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c
index e5bfde42134..8f7339d500e 100644
--- a/reactos/win32ss/user/ntuser/sysparams.c
+++ b/reactos/win32ss/user/ntuser/sysparams.c
@@ -906,27 +906,11 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
 
         case SPI_GETNONCLIENTMETRICS:
         {
-            LPNONCLIENTMETRICSW metrics = (LPNONCLIENTMETRICSW)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(NONCLIENTMETRICSW))
-                return 0;
-
-            if (!metrics || metrics->cbSize != sizeof(NONCLIENTMETRICSW))
-                return 0;
-
             return SpiGet(pvParam, &gspv.ncm, sizeof(NONCLIENTMETRICSW), fl);
         }
 
         case SPI_SETNONCLIENTMETRICS:
         {
-            LPNONCLIENTMETRICSW metrics = (LPNONCLIENTMETRICSW)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(NONCLIENTMETRICSW))
-                return 0;
-
-            if (!metrics || metrics->cbSize != sizeof(NONCLIENTMETRICSW))
-                return 0;
-
             if (!SpiSet(&gspv.ncm, pvParam, sizeof(NONCLIENTMETRICSW), fl))
                 return 0;
 
@@ -959,27 +943,11 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
 
         case SPI_GETMINIMIZEDMETRICS:
         {
-            LPMINIMIZEDMETRICS metrics = (LPMINIMIZEDMETRICS)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(MINIMIZEDMETRICS))
-                return 0;
-
-            if (!metrics || metrics->cbSize != sizeof(MINIMIZEDMETRICS))
-                return 0;
-
             return SpiGet(pvParam, &gspv.mm, sizeof(MINIMIZEDMETRICS), fl);
         }
 
         case SPI_SETMINIMIZEDMETRICS:
         {
-            LPMINIMIZEDMETRICS metrics = (LPMINIMIZEDMETRICS)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(MINIMIZEDMETRICS))
-                return 0;
-
-            if (!metrics || metrics->cbSize != sizeof(MINIMIZEDMETRICS))
-                return 0;
-
             if (!SpiSet(&gspv.mm, pvParam, sizeof(MINIMIZEDMETRICS), fl))
                 return 0;
 
@@ -1001,27 +969,11 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
 
         case SPI_GETICONMETRICS:
         {
-            LPICONMETRICSW IconMetrics = (LPICONMETRICSW)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(ICONMETRICSW))
-                return 0;
-
-            if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICSW))
-                return 0;
-
             return SpiGet(pvParam, &gspv.im, sizeof(ICONMETRICSW), fl);
         }
 
         case SPI_SETICONMETRICS:
         {
-            LPICONMETRICSW IconMetrics = (LPICONMETRICSW)pvParam;
-
-            if (uiParam != 0 && uiParam != sizeof(ICONMETRICSW))
-                return 0;
-
-            if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICSW))
-                return 0;
-
             if (!SpiSet(&gspv.im, pvParam, sizeof(ICONMETRICSW), fl))
                 return 0;
 
diff --git a/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
index 3d955a584ef..8650d66b580 100644
--- a/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
+++ b/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
@@ -743,7 +743,6 @@ Test_SPI_SETNONCLIENTMETRICS(void)
 
     metrics.cbSize = sizeof(NONCLIENTMETRICSW);
     TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1);
-    TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW) + 1, &metrics, 0) == 0);
     TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0);
 }
 
@@ -754,7 +753,6 @@ Test_SPI_SETMINIMIZEDMETRICS(void)
 
     metrics.cbSize = sizeof(MINIMIZEDMETRICS);
     TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1);
-    TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS) + 1, (PVOID)&metrics, 0) == 0);
     TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0);
 }
 
@@ -765,7 +763,6 @@ Test_SPI_SETICONMETRICS(void)
 
     metrics.cbSize = sizeof(ICONMETRICSW);
     TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)&metrics, 0) == 1);
-    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW) + 1, (PVOID)&metrics, 0) == 0);
     TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)0xdeadbeef, 0) == 0);
 }
 
-- 
2.17.1