[PATCH 1/2] user32/tests: Add some tests for font charset returned by SPI_GETICONTITLELOGFONT and SPI_GETNONCLIENTMETRICS.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
 dlls/user32/tests/sysparams.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 4f2709094e9..e354ef69a94 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -4124,6 +4124,31 @@ static void test_GetAutoRotationState(void)
     ok(ret, "Expected GetAutoRotationState to succeed, error %ld\n", GetLastError());
 }
 
+static void test_LOGFONT_charset(void)
+{
+    CHARSETINFO csi;
+    LOGFONTA lf;
+    NONCLIENTMETRICSA ncm;
+    BOOL ret;
+
+    ret = TranslateCharsetInfo(ULongToPtr(GetACP()), &csi, TCI_SRCCODEPAGE);
+    ok(ret, "TranslateCharsetInfo(%d) error %lu\n", GetACP(), GetLastError());
+
+    GetObjectA(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf);
+    ok(lf.lfCharSet == csi.ciCharset, "got %d, expected %d\n", lf.lfCharSet, csi.ciCharset);
+
+    ret = SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, FALSE);
+    ok(ret, "SystemParametersInfoW error %lu\n", GetLastError());
+    todo_wine
+    ok(lf.lfCharSet == DEFAULT_CHARSET, "got %d\n", lf.lfCharSet);
+
+    ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);
+    ret = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
+    ok(ret, "SystemParametersInfoW error %lu\n", GetLastError());
+    todo_wine
+    ok(ncm.lfCaptionFont.lfCharSet == DEFAULT_CHARSET, "got %d\n", ncm.lfCaptionFont.lfCharSet);
+}
+
 START_TEST(sysparams)
 {
     int argc;
@@ -4172,6 +4197,8 @@ START_TEST(sysparams)
     strict=(argc >= 3 && strcmp(argv[2],"strict")==0);
     trace("strict=%d\n",strict);
 
+    test_LOGFONT_charset();
+
     trace("testing GetSystemMetrics with your current desktop settings\n");
     test_GetSystemMetrics( );
     test_metrics_for_dpi( 192 );
-- 
2.37.2