@@ -716,8 +716,6 @@ Test_SPI_SETICONTITLELOGFONT(void)
716
716
717
717
/* Test uiParam < 0 */
718
718
TEST (NtUserSystemParametersInfo (SPI_GETICONTITLELOGFONT , -1 , & buf .lf , 0 ) == 1 );
719
-
720
-
721
719
}
722
720
723
721
void
@@ -740,30 +738,60 @@ void
740
738
Test_SPI_SETNONCLIENTMETRICS (void )
741
739
{
742
740
NONCLIENTMETRICSW metrics ;
741
+ NONCLIENTMETRICSW origMetrics ;
743
742
744
743
metrics .cbSize = sizeof (NONCLIENTMETRICSW );
745
744
TEST (NtUserSystemParametersInfo (SPI_GETNONCLIENTMETRICS , sizeof (NONCLIENTMETRICSW ), & metrics , 0 ) == 1 );
746
745
TEST (NtUserSystemParametersInfo (SPI_GETNONCLIENTMETRICS , sizeof (NONCLIENTMETRICSW ), (PVOID )0xdeadbeef , 0 ) == 0 );
746
+
747
+ origMetrics = metrics ;
748
+
749
+ metrics .cbSize = sizeof (NONCLIENTMETRICSW ) + 10 ;
750
+ TEST (NtUserSystemParametersInfo (SPI_SETNONCLIENTMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
751
+ TEST (NtUserSystemParametersInfo (SPI_GETNONCLIENTMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
752
+ ok (metrics .cbSize == sizeof (NONCLIENTMETRICSW ), "Expected size: %lu, got %lu\n" , (ULONG )sizeof (NONCLIENTMETRICSW ), (ULONG )metrics .cbSize );
753
+
754
+ TEST (NtUserSystemParametersInfo (SPI_SETNONCLIENTMETRICS , 0 , (PVOID )& origMetrics , 0 ) == 1 );
747
755
}
748
756
749
757
void
750
758
Test_SPI_SETMINIMIZEDMETRICS (void )
751
759
{
752
760
MINIMIZEDMETRICS metrics ;
761
+ MINIMIZEDMETRICS origMetrics ;
753
762
754
763
metrics .cbSize = sizeof (MINIMIZEDMETRICS );
755
764
TEST (NtUserSystemParametersInfo (SPI_GETMINIMIZEDMETRICS , sizeof (MINIMIZEDMETRICS ), (PVOID )& metrics , 0 ) == 1 );
756
765
TEST (NtUserSystemParametersInfo (SPI_GETMINIMIZEDMETRICS , sizeof (MINIMIZEDMETRICS ), (PVOID )0xdeadbeef , 0 ) == 0 );
766
+
767
+ origMetrics = metrics ;
768
+
769
+ metrics .cbSize = sizeof (MINIMIZEDMETRICS ) + 10 ;
770
+ TEST (NtUserSystemParametersInfo (SPI_SETMINIMIZEDMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
771
+ TEST (NtUserSystemParametersInfo (SPI_GETMINIMIZEDMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
772
+ ok (metrics .cbSize == sizeof (MINIMIZEDMETRICS ), "Expected size: %lu, got %lu\n" , (ULONG )sizeof (MINIMIZEDMETRICS ), (ULONG )metrics .cbSize );
773
+
774
+ TEST (NtUserSystemParametersInfo (SPI_SETMINIMIZEDMETRICS , 0 , (PVOID )& origMetrics , 0 ) == 1 );
757
775
}
758
776
759
777
void
760
778
Test_SPI_SETICONMETRICS (void )
761
779
{
762
780
ICONMETRICSW metrics ;
781
+ ICONMETRICSW origMetrics ;
763
782
764
783
metrics .cbSize = sizeof (ICONMETRICSW );
765
784
TEST (NtUserSystemParametersInfo (SPI_GETICONMETRICS , sizeof (ICONMETRICSW ), (PVOID )& metrics , 0 ) == 1 );
766
785
TEST (NtUserSystemParametersInfo (SPI_GETICONMETRICS , sizeof (ICONMETRICSW ), (PVOID )0xdeadbeef , 0 ) == 0 );
786
+
787
+ origMetrics = metrics ;
788
+
789
+ metrics .cbSize = sizeof (ICONMETRICSW ) + 10 ;
790
+ TEST (NtUserSystemParametersInfo (SPI_SETICONMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
791
+ TEST (NtUserSystemParametersInfo (SPI_GETICONMETRICS , 0 , (PVOID )& metrics , 0 ) == 1 );
792
+ ok (metrics .cbSize == sizeof (ICONMETRICSW ), "Expected size: %lu, got %lu\n" , (ULONG )sizeof (ICONMETRICSW ), (ULONG )metrics .cbSize );
793
+
794
+ TEST (NtUserSystemParametersInfo (SPI_SETICONMETRICS , 0 , (PVOID )& origMetrics , 0 ) == 1 );
767
795
}
768
796
769
797
void
0 commit comments