From cd57c21259a86cac125341af9f4020d2464a556b Mon Sep 17 00:00:00 2001 From: Frank Richter Date: Fri, 8 Jul 2005 11:30:50 +0000 Subject: [PATCH] Always zero destination buffer in SYSPARAMS_LoadRaw(). Remove now-superfluous memory zeroing in some other places. --- dlls/user/sysparams.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 9ac9f828196..031a3a34b49 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -458,10 +458,10 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, LPBYTE lpBuf DWORD type; HKEY hKey; + memset( lpBuf, 0, count ); if ((RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) || (RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS)) { - memset( lpBuf, 0, count ); ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, (LPBYTE)lpBuf, &count); RegCloseKey( hKey ); } @@ -2460,9 +2460,8 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, spi_idx = SPI_SETGRADIENTCAPTIONS_IDX; - if (!SYSPARAMS_LoadRaw( SPI_USERPREFERENCEMASK_REGKEY, - SPI_USERPREFERENCEMASK_VALNAME, buf, sizeof(buf) )) - memset (buf, 0, sizeof (buf)); + SYSPARAMS_LoadRaw( SPI_USERPREFERENCEMASK_REGKEY, + SPI_USERPREFERENCEMASK_VALNAME, buf, sizeof(buf) ); if (b) buf[0] |= 0x10; @@ -2574,9 +2573,8 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, spi_idx = SPI_SETFLATMENU_IDX; - if (!SYSPARAMS_LoadRaw( SPI_USERPREFERENCEMASK_REGKEY, - SPI_USERPREFERENCEMASK_VALNAME, buf, sizeof(buf) )) - memset (buf, 0, sizeof (buf)); + SYSPARAMS_LoadRaw( SPI_USERPREFERENCEMASK_REGKEY, + SPI_USERPREFERENCEMASK_VALNAME, buf, sizeof(buf) ); if (b) buf[2] |= 0x02;