[FORMATTING] Fix indentation

svn path=/trunk/; revision=31653
This commit is contained in:
Hervé Poussineau 2008-01-07 20:55:02 +00:00
parent b195ebe655
commit cd933bb16c

View file

@ -69,7 +69,7 @@ ReadRegSzKey(
} }
static static
BOOL IsConsoleShell(void) BOOL IsConsoleShell(VOID)
{ {
HKEY ControlKey = NULL; HKEY ControlKey = NULL;
LPWSTR SystemStartOptions = NULL; LPWSTR SystemStartOptions = NULL;
@ -111,7 +111,9 @@ cleanup:
} }
static static
BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey) BOOL GetShell(
OUT WCHAR *CommandLine, /* must be at least MAX_PATH long */
IN HKEY hRootKey)
{ {
HKEY hKey; HKEY hKey;
DWORD Type, Size; DWORD Type, Size;
@ -119,19 +121,18 @@ BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey)
BOOL Ret = FALSE; BOOL Ret = FALSE;
BOOL ConsoleShell = IsConsoleShell(); BOOL ConsoleShell = IsConsoleShell();
if(RegOpenKeyEx(hRootKey, if (RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON,
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", /* FIXME: should be REGSTR_PATH_WINLOGON */
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{ {
Size = MAX_PATH * sizeof(WCHAR); Size = MAX_PATH * sizeof(WCHAR);
if(RegQueryValueEx(hKey, if (RegQueryValueEx(hKey,
ConsoleShell ? L"ConsoleShell" : L"Shell", ConsoleShell ? L"ConsoleShell" : L"Shell",
NULL, NULL,
&Type, &Type,
(LPBYTE)Shell, (LPBYTE)Shell,
&Size) == ERROR_SUCCESS) &Size) == ERROR_SUCCESS)
{ {
if((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) if ((Type == REG_SZ) || (Type == REG_EXPAND_SZ))
{ {
wcscpy(CommandLine, Shell); wcscpy(CommandLine, Shell);
Ret = TRUE; Ret = TRUE;
@ -144,7 +145,8 @@ BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey)
} }
static VOID static VOID
StartAutoApplications(int clsid) StartAutoApplications(
IN INT clsid)
{ {
WCHAR szPath[MAX_PATH] = {0}; WCHAR szPath[MAX_PATH] = {0};
HRESULT hResult; HRESULT hResult;
@ -179,13 +181,13 @@ StartAutoApplications(int clsid)
ExecInfo.lpDirectory = szPath; ExecInfo.lpDirectory = szPath;
ShellExecuteExW(&ExecInfo); ShellExecuteExW(&ExecInfo);
} }
}while(FindNextFileW(hFind, &findData)); } while (FindNextFileW(hFind, &findData));
FindClose(hFind); FindClose(hFind);
} }
static BOOL static BOOL
TryToStartShell(LPCWSTR Shell) TryToStartShell(
IN LPCWSTR Shell)
{ {
STARTUPINFO si; STARTUPINFO si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
@ -197,7 +199,7 @@ TryToStartShell(LPCWSTR Shell)
ExpandEnvironmentStrings(Shell, ExpandedShell, MAX_PATH); ExpandEnvironmentStrings(Shell, ExpandedShell, MAX_PATH);
if(!CreateProcess(NULL, if (!CreateProcess(NULL,
ExpandedShell, ExpandedShell,
NULL, NULL,
NULL, NULL,
@ -207,7 +209,9 @@ TryToStartShell(LPCWSTR Shell)
NULL, NULL,
&si, &si,
&pi)) &pi))
{
return FALSE; return FALSE;
}
StartAutoApplications(CSIDL_STARTUP); StartAutoApplications(CSIDL_STARTUP);
StartAutoApplications(CSIDL_COMMON_STARTUP); StartAutoApplications(CSIDL_COMMON_STARTUP);
@ -218,30 +222,34 @@ TryToStartShell(LPCWSTR Shell)
} }
static static
void StartShell(void) VOID StartShell(VOID)
{ {
WCHAR Shell[MAX_PATH]; WCHAR Shell[MAX_PATH];
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* Try to run shell in user key */ /* Try to run shell in user key */
if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell))
{
return; return;
}
/* Try to run shell in local machine key */ /* Try to run shell in local machine key */
if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell))
{
return; return;
}
/* Try default shell */ /* Try default shell */
if (IsConsoleShell()) if (IsConsoleShell())
{ {
if(GetSystemDirectory(Shell, MAX_PATH - 8)) if (GetSystemDirectory(Shell, MAX_PATH - 8))
wcscat(Shell, L"\\cmd.exe"); wcscat(Shell, L"\\cmd.exe");
else else
wcscpy(Shell, L"cmd.exe"); wcscpy(Shell, L"cmd.exe");
} }
else else
{ {
if(GetWindowsDirectory(Shell, MAX_PATH - 13)) if (GetWindowsDirectory(Shell, MAX_PATH - 13))
wcscat(Shell, L"\\explorer.exe"); wcscat(Shell, L"\\explorer.exe");
else else
wcscpy(Shell, L"explorer.exe"); wcscpy(Shell, L"explorer.exe");
@ -253,8 +261,8 @@ void StartShell(void)
} }
} }
WCHAR g_RegColorNames[][32] = WCHAR g_RegColorNames[][32] = {
{L"Scrollbar", /* 00 = COLOR_SCROLLBAR */ L"Scrollbar", /* 00 = COLOR_SCROLLBAR */
L"Background", /* 01 = COLOR_DESKTOP */ L"Background", /* 01 = COLOR_DESKTOP */
L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */ L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */
L"InactiveTitle", /* 03 = COLOR_INACTIVECAPTION */ L"InactiveTitle", /* 03 = COLOR_INACTIVECAPTION */
@ -289,7 +297,8 @@ WCHAR g_RegColorNames[][32] =
#define NUM_SYSCOLORS (sizeof(g_RegColorNames) / sizeof(g_RegColorNames[0])) #define NUM_SYSCOLORS (sizeof(g_RegColorNames) / sizeof(g_RegColorNames[0]))
static static
COLORREF StrToColorref(LPWSTR lpszCol) COLORREF StrToColorref(
IN LPWSTR lpszCol)
{ {
BYTE rgb[3]; BYTE rgb[3];
@ -302,7 +311,7 @@ COLORREF StrToColorref(LPWSTR lpszCol)
} }
static static
void SetUserSysColors(void) VOID SetUserSysColors(VOID)
{ {
HKEY hKey; HKEY hKey;
INT i; INT i;
@ -310,8 +319,7 @@ void SetUserSysColors(void)
DWORD Type, Size; DWORD Type, Size;
COLORREF crColor; COLORREF crColor;
if(!RegOpenKeyEx(HKEY_CURRENT_USER, if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_COLORS,
L"Control Panel\\Colors",
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{ {
return; return;
@ -319,8 +327,9 @@ void SetUserSysColors(void)
for(i = 0; i < NUM_SYSCOLORS; i++) for(i = 0; i < NUM_SYSCOLORS; i++)
{ {
Size = sizeof(szColor); Size = sizeof(szColor);
if(RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type, 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); crColor = StrToColorref(szColor);
SetSysColors(1, &i, &crColor); SetSysColors(1, &i, &crColor);
@ -331,7 +340,9 @@ void SetUserSysColors(void)
} }
static static
void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont) VOID LoadUserFontSetting(
IN LPWSTR lpValueName,
OUT PLOGFONTW pFont)
{ {
HKEY hKey; HKEY hKey;
LOGFONTW lfTemp; LOGFONTW lfTemp;
@ -339,8 +350,7 @@ void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont)
INT error; INT error;
Size = sizeof(LOGFONTW); Size = sizeof(LOGFONTW);
if(!RegOpenKeyEx(HKEY_CURRENT_USER, if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS,
L"Control Panel\\Desktop\\WindowMetrics",
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{ {
return; return;
@ -353,11 +363,12 @@ void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont)
RegCloseKey(hKey); RegCloseKey(hKey);
/* FIXME: Check if lfTemp is a valid font */ /* FIXME: Check if lfTemp is a valid font */
*pFont = lfTemp; *pFont = lfTemp;
return;
} }
static static
void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue) VOID LoadUserMetricSetting(
IN LPWSTR lpValueName,
OUT INT *pValue)
{ {
HKEY hKey; HKEY hKey;
DWORD Type, Size; DWORD Type, Size;
@ -365,8 +376,7 @@ void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue)
WCHAR strValue[8]; WCHAR strValue[8];
Size = sizeof(strValue); Size = sizeof(strValue);
if(!RegOpenKeyEx(HKEY_CURRENT_USER, if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS,
L"Control Panel\\Desktop\\WindowMetrics",
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{ {
return; return;
@ -378,11 +388,10 @@ void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue)
} }
RegCloseKey(hKey); RegCloseKey(hKey);
*pValue = StrToInt(strValue); *pValue = StrToInt(strValue);
return;
} }
static static
void SetUserMetrics(void) VOID SetUserMetrics(VOID)
{ {
NONCLIENTMETRICSW ncmetrics; NONCLIENTMETRICSW ncmetrics;
MINIMIZEDMETRICS mmmetrics; MINIMIZEDMETRICS mmmetrics;
@ -410,29 +419,26 @@ void SetUserMetrics(void)
LoadUserMetricSetting(L"MenuHeight", &ncmetrics.iMenuHeight); LoadUserMetricSetting(L"MenuHeight", &ncmetrics.iMenuHeight);
SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0); SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0);
return;
} }
static static
void SetUserWallpaper(void) VOID SetUserWallpaper(VOID)
{ {
HKEY hKey; HKEY hKey;
DWORD Type, Size; DWORD Type, Size;
WCHAR szWallpaper[MAX_PATH + 1]; WCHAR szWallpaper[MAX_PATH + 1];
if(RegOpenKeyEx(HKEY_CURRENT_USER, if (RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP,
REGSTR_PATH_DESKTOP,
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{ {
Size = sizeof(szWallpaper); Size = sizeof(szWallpaper);
if(RegQueryValueEx(hKey, if (RegQueryValueEx(hKey,
L"Wallpaper", L"Wallpaper",
NULL, NULL,
&Type, &Type,
(LPBYTE)szWallpaper, (LPBYTE)szWallpaper,
&Size) == ERROR_SUCCESS &Size) == ERROR_SUCCESS &&
&& Type == REG_SZ) Type == REG_SZ)
{ {
ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH); ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH);
@ -449,7 +455,7 @@ void SetUserWallpaper(void)
} }
static static
void SetUserSettings(void) VOID SetUserSettings(VOID)
{ {
SetUserSysColors(); SetUserSysColors();
SetUserMetrics(); SetUserMetrics();
@ -475,17 +481,15 @@ NotifyLogon(VOID)
} }
} }
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4100) #pragma warning(disable : 4100)
#endif /* _MSC_VER */ #endif /* _MSC_VER */
int WINAPI int WINAPI
WinMain(HINSTANCE hInst, WinMain(IN HINSTANCE hInst,
HINSTANCE hPrevInstance, IN HINSTANCE hPrevInstance,
LPSTR lpszCmdLine, IN LPSTR lpszCmdLine,
int nCmdShow) IN int nCmdShow)
{ {
NotifyLogon(); NotifyLogon();
SetUserSettings(); SetUserSettings();