mirror of
https://github.com/reactos/reactos.git
synced 2024-07-14 00:25:05 +00:00
[FORMATTING] Fix indentation
svn path=/trunk/; revision=31653
This commit is contained in:
Hervé Poussineau
parent
b195ebe655
commit
cd933bb16c
|
|
@ -69,7 +69,7 @@ ReadRegSzKey(
|
|||
}
|
||||
|
||||
static
|
||||
BOOL IsConsoleShell(void)
|
||||
BOOL IsConsoleShell(VOID)
|
||||
{
|
||||
HKEY ControlKey = NULL;
|
||||
LPWSTR SystemStartOptions = NULL;
|
||||
|
|
@ -111,7 +111,9 @@ cleanup:
|
|||
}
|
||||
|
||||
static
|
||||
BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey)
|
||||
BOOL GetShell(
|
||||
OUT WCHAR *CommandLine, /* must be at least MAX_PATH long */
|
||||
IN HKEY hRootKey)
|
||||
{
|
||||
HKEY hKey;
|
||||
DWORD Type, Size;
|
||||
|
|
@ -119,8 +121,7 @@ BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey)
|
|||
BOOL Ret = FALSE;
|
||||
BOOL ConsoleShell = IsConsoleShell();
|
||||
|
||||
if(RegOpenKeyEx(hRootKey,
|
||||
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", /* FIXME: should be REGSTR_PATH_WINLOGON */
|
||||
if (RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON,
|
||||
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
|
||||
{
|
||||
Size = MAX_PATH * sizeof(WCHAR);
|
||||
|
|
@ -144,7 +145,8 @@ BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey)
|
|||
}
|
||||
|
||||
static VOID
|
||||
StartAutoApplications(int clsid)
|
||||
StartAutoApplications(
|
||||
IN INT clsid)
|
||||
{
|
||||
WCHAR szPath[MAX_PATH] = {0};
|
||||
HRESULT hResult;
|
||||
|
|
@ -183,9 +185,9 @@ StartAutoApplications(int clsid)
|
|||
FindClose(hFind);
|
||||
}
|
||||
|
||||
|
||||
static BOOL
|
||||
TryToStartShell(LPCWSTR Shell)
|
||||
TryToStartShell(
|
||||
IN LPCWSTR Shell)
|
||||
{
|
||||
STARTUPINFO si;
|
||||
PROCESS_INFORMATION pi;
|
||||
|
|
@ -207,7 +209,9 @@ TryToStartShell(LPCWSTR Shell)
|
|||
NULL,
|
||||
&si,
|
||||
&pi))
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
StartAutoApplications(CSIDL_STARTUP);
|
||||
StartAutoApplications(CSIDL_COMMON_STARTUP);
|
||||
|
|
@ -218,18 +222,22 @@ TryToStartShell(LPCWSTR Shell)
|
|||
}
|
||||
|
||||
static
|
||||
void StartShell(void)
|
||||
VOID StartShell(VOID)
|
||||
{
|
||||
WCHAR Shell[MAX_PATH];
|
||||
TCHAR szMsg[RC_STRING_MAX_SIZE];
|
||||
|
||||
/* Try to run shell in user key */
|
||||
if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* Try to run shell in local machine key */
|
||||
if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* Try default shell */
|
||||
if (IsConsoleShell())
|
||||
|
|
@ -253,8 +261,8 @@ void StartShell(void)
|
|||
}
|
||||
}
|
||||
|
||||
WCHAR g_RegColorNames[][32] =
|
||||
{L"Scrollbar", /* 00 = COLOR_SCROLLBAR */
|
||||
WCHAR g_RegColorNames[][32] = {
|
||||
L"Scrollbar", /* 00 = COLOR_SCROLLBAR */
|
||||
L"Background", /* 01 = COLOR_DESKTOP */
|
||||
L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */
|
||||
L"InactiveTitle", /* 03 = COLOR_INACTIVECAPTION */
|
||||
|
|
@ -289,7 +297,8 @@ WCHAR g_RegColorNames[][32] =
|
|||
#define NUM_SYSCOLORS (sizeof(g_RegColorNames) / sizeof(g_RegColorNames[0]))
|
||||
|
||||
static
|
||||
COLORREF StrToColorref(LPWSTR lpszCol)
|
||||
COLORREF StrToColorref(
|
||||
IN LPWSTR lpszCol)
|
||||
{
|
||||
BYTE rgb[3];
|
||||
|
||||
|
|
@ -302,7 +311,7 @@ COLORREF StrToColorref(LPWSTR lpszCol)
|
|||
}
|
||||
|
||||
static
|
||||
void SetUserSysColors(void)
|
||||
VOID SetUserSysColors(VOID)
|
||||
{
|
||||
HKEY hKey;
|
||||
INT i;
|
||||
|
|
@ -310,8 +319,7 @@ void SetUserSysColors(void)
|
|||
DWORD Type, Size;
|
||||
COLORREF crColor;
|
||||
|
||||
if(!RegOpenKeyEx(HKEY_CURRENT_USER,
|
||||
L"Control Panel\\Colors",
|
||||
if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_COLORS,
|
||||
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
|
||||
{
|
||||
return;
|
||||
|
|
@ -320,7 +328,8 @@ void SetUserSysColors(void)
|
|||
{
|
||||
Size = sizeof(szColor);
|
||||
if (RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type,
|
||||
(LPBYTE)szColor, &Size) == ERROR_SUCCESS && Type == REG_SZ)
|
||||
(LPBYTE)szColor, &Size) == ERROR_SUCCESS &&
|
||||
Type == REG_SZ)
|
||||
{
|
||||
crColor = StrToColorref(szColor);
|
||||
SetSysColors(1, &i, &crColor);
|
||||
|
|
@ -331,7 +340,9 @@ void SetUserSysColors(void)
|
|||
}
|
||||
|
||||
static
|
||||
void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont)
|
||||
VOID LoadUserFontSetting(
|
||||
IN LPWSTR lpValueName,
|
||||
OUT PLOGFONTW pFont)
|
||||
{
|
||||
HKEY hKey;
|
||||
LOGFONTW lfTemp;
|
||||
|
|
@ -339,8 +350,7 @@ void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont)
|
|||
INT error;
|
||||
|
||||
Size = sizeof(LOGFONTW);
|
||||
if(!RegOpenKeyEx(HKEY_CURRENT_USER,
|
||||
L"Control Panel\\Desktop\\WindowMetrics",
|
||||
if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS,
|
||||
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
|
||||
{
|
||||
return;
|
||||
|
|
@ -353,11 +363,12 @@ void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont)
|
|||
RegCloseKey(hKey);
|
||||
/* FIXME: Check if lfTemp is a valid font */
|
||||
*pFont = lfTemp;
|
||||
return;
|
||||
}
|
||||
|
||||
static
|
||||
void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue)
|
||||
VOID LoadUserMetricSetting(
|
||||
IN LPWSTR lpValueName,
|
||||
OUT INT *pValue)
|
||||
{
|
||||
HKEY hKey;
|
||||
DWORD Type, Size;
|
||||
|
|
@ -365,8 +376,7 @@ void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue)
|
|||
WCHAR strValue[8];
|
||||
|
||||
Size = sizeof(strValue);
|
||||
if(!RegOpenKeyEx(HKEY_CURRENT_USER,
|
||||
L"Control Panel\\Desktop\\WindowMetrics",
|
||||
if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS,
|
||||
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
|
||||
{
|
||||
return;
|
||||
|
|
@ -378,11 +388,10 @@ void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue)
|
|||
}
|
||||
RegCloseKey(hKey);
|
||||
*pValue = StrToInt(strValue);
|
||||
return;
|
||||
}
|
||||
|
||||
static
|
||||
void SetUserMetrics(void)
|
||||
VOID SetUserMetrics(VOID)
|
||||
{
|
||||
NONCLIENTMETRICSW ncmetrics;
|
||||
MINIMIZEDMETRICS mmmetrics;
|
||||
|
|
@ -410,19 +419,16 @@ void SetUserMetrics(void)
|
|||
LoadUserMetricSetting(L"MenuHeight", &ncmetrics.iMenuHeight);
|
||||
|
||||
SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static
|
||||
void SetUserWallpaper(void)
|
||||
VOID SetUserWallpaper(VOID)
|
||||
{
|
||||
HKEY hKey;
|
||||
DWORD Type, Size;
|
||||
WCHAR szWallpaper[MAX_PATH + 1];
|
||||
|
||||
if(RegOpenKeyEx(HKEY_CURRENT_USER,
|
||||
REGSTR_PATH_DESKTOP,
|
||||
if (RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP,
|
||||
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
|
||||
{
|
||||
Size = sizeof(szWallpaper);
|
||||
|
|
@ -431,8 +437,8 @@ void SetUserWallpaper(void)
|
|||
NULL,
|
||||
&Type,
|
||||
(LPBYTE)szWallpaper,
|
||||
&Size) == ERROR_SUCCESS
|
||||
&& Type == REG_SZ)
|
||||
&Size) == ERROR_SUCCESS &&
|
||||
Type == REG_SZ)
|
||||
{
|
||||
ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH);
|
||||
|
||||
|
|
@ -449,7 +455,7 @@ void SetUserWallpaper(void)
|
|||
}
|
||||
|
||||
static
|
||||
void SetUserSettings(void)
|
||||
VOID SetUserSettings(VOID)
|
||||
{
|
||||
SetUserSysColors();
|
||||
SetUserMetrics();
|
||||
|
|
@ -475,17 +481,15 @@ NotifyLogon(VOID)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable : 4100)
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
int WINAPI
|
||||
WinMain(HINSTANCE hInst,
|
||||
HINSTANCE hPrevInstance,
|
||||
LPSTR lpszCmdLine,
|
||||
int nCmdShow)
|
||||
WinMain(IN HINSTANCE hInst,
|
||||
IN HINSTANCE hPrevInstance,
|
||||
IN LPSTR lpszCmdLine,
|
||||
IN int nCmdShow)
|
||||
{
|
||||
NotifyLogon();
|
||||
SetUserSettings();
|
||||
|
|
|
|||
Loading…
Reference in a new issue