From 4ad39f0a27b73c8d33868c9e77386b807f60e9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Mon, 11 Aug 2003 11:02:43 +0000 Subject: [PATCH] Fixes to SystemParametersInfoA (Unicode->Ansi conversions) svn path=/trunk/; revision=5527 --- reactos/lib/user32/misc/desktop.c | 32 +++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c index c941f4b32ea..08aeddb3535 100644 --- a/reactos/lib/user32/misc/desktop.c +++ b/reactos/lib/user32/misc/desktop.c @@ -1,4 +1,4 @@ -/* $Id: desktop.c,v 1.22 2003/08/09 18:22:11 mf Exp $ +/* $Id: desktop.c,v 1.23 2003/08/11 11:02:43 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -13,6 +13,7 @@ #include #include #include +#include /* * @implemented @@ -33,7 +34,34 @@ SystemParametersInfoA(UINT uiAction, PVOID pvParam, UINT fWinIni) { - return(SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni)); + WINBOOL Ret; + NONCLIENTMETRICSA *nclma; + NONCLIENTMETRICSW nclmw; + + switch (uiAction) + { + case SPI_GETNONCLIENTMETRICS: + nclma = pvParam; + nclmw.cbSize = sizeof(NONCLIENTMETRICSW); + uiParam = sizeof(NONCLIENTMETRICSW); + pvParam = &nclmw; + break; + } + Ret = SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + if (! Ret) + { + return FALSE; + } + + switch (uiAction) + { + case SPI_GETNONCLIENTMETRICS: + RosRtlLogFontW2A(&(nclma->lfCaptionFont), &(nclmw.lfCaptionFont)); + RosRtlLogFontW2A(&(nclma->lfSmCaptionFont), &(nclmw.lfSmCaptionFont)); + return TRUE; + } + + return TRUE; }