From: Eric Kohl Date: Sat, 29 Sep 2012 09:06:42 +0000 (+0000) Subject: [FORMATTING] X-Git-Tag: backups/ros-csrss@57560~134 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e13b43c15df6ab97581ddfc535cfe19f0ab8ae2b [FORMATTING] - Fix indentation. - Remove dead code. No code changes! svn path=/trunk/; revision=57422 --- diff --git a/reactos/dll/win32/advapi32/misc/logon.c b/reactos/dll/win32/advapi32/misc/logon.c index 28f7db7fa7f..161cbd434ae 100644 --- a/reactos/dll/win32/advapi32/misc/logon.c +++ b/reactos/dll/win32/advapi32/misc/logon.c @@ -130,9 +130,18 @@ CreateProcessAsUserW(HANDLE hToken, /* * @unimplemented */ -BOOL WINAPI CreateProcessWithLogonW( LPCWSTR lpUsername, LPCWSTR lpDomain, LPCWSTR lpPassword, DWORD dwLogonFlags, - LPCWSTR lpApplicationName, LPWSTR lpCommandLine, DWORD dwCreationFlags, LPVOID lpEnvironment, - LPCWSTR lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) +BOOL WINAPI +CreateProcessWithLogonW(LPCWSTR lpUsername, + LPCWSTR lpDomain, + LPCWSTR lpPassword, + DWORD dwLogonFlags, + LPCWSTR lpApplicationName, + LPWSTR lpCommandLine, + DWORD dwCreationFlags, + LPVOID lpEnvironment, + LPCWSTR lpCurrentDirectory, + LPSTARTUPINFOW lpStartupInfo, + LPPROCESS_INFORMATION lpProcessInformation) { FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain), debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName), @@ -301,98 +310,6 @@ static BOOL WINAPI GetUserSid(LPCWSTR UserName, PSID *Sid) { -#if 0 - PSID lpSid; - DWORD dwLength; - HKEY hUsersKey; - HKEY hUserKey; - - if (Sid != NULL) - *Sid = NULL; - - /* Open the Users key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users", - 0, - KEY_READ, - &hUsersKey)) - { - ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Open the user key */ - if (RegOpenKeyExW(hUsersKey, - UserName, - 0, - KEY_READ, - &hUserKey)) - { - if (GetLastError() == ERROR_FILE_NOT_FOUND) - { - ERR("Invalid user name!\n"); - SetLastError(ERROR_NO_SUCH_USER); - } - else - { - ERR("Failed to open user key! (Error %lu)\n", GetLastError()); - } - - RegCloseKey(hUsersKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - /* Get SID size */ - dwLength = 0; - if (RegQueryValueExW(hUserKey, - L"Sid", - NULL, - NULL, - NULL, - &dwLength)) - { - ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); - RegCloseKey(hUserKey); - return FALSE; - } - - /* Allocate sid buffer */ - TRACE("Required SID buffer size: %lu\n", dwLength); - lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - dwLength); - if (lpSid == NULL) - { - ERR("Failed to allocate SID buffer!\n"); - RegCloseKey(hUserKey); - return FALSE; - } - - /* Read sid */ - if (RegQueryValueExW(hUserKey, - L"Sid", - NULL, - NULL, - (LPBYTE)lpSid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - lpSid); - RegCloseKey(hUserKey); - return FALSE; - } - - RegCloseKey(hUserKey); - - *Sid = lpSid; - - return TRUE; -#endif - PSID AccountDomainSid = NULL; ULONG ulUserRid; DWORD dwLength; diff --git a/reactos/dll/win32/advapi32/misc/shutdown.c b/reactos/dll/win32/advapi32/misc/shutdown.c index d55df8e238f..a7a0f31d1ba 100644 --- a/reactos/dll/win32/advapi32/misc/shutdown.c +++ b/reactos/dll/win32/advapi32/misc/shutdown.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/advapi32/misc/shutdown.c * PURPOSE: System shutdown functions - * PROGRAMMER: Lee Schroeder + * PROGRAMMER: Lee Schroeder * Emanuele Aliberti */ @@ -64,7 +64,7 @@ InitiateSystemShutdownW(LPWSTR lpMachineName, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - return InitiateSystemShutdownExW(lpMachineName, + return InitiateSystemShutdownExW(lpMachineName, lpMessage, dwTimeout, bForceAppsClosed, @@ -87,7 +87,7 @@ InitiateSystemShutdownA(LPSTR lpMachineName, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - return InitiateSystemShutdownExA(lpMachineName, + return InitiateSystemShutdownExA(lpMachineName, lpMessage, dwTimeout, bForceAppsClosed, @@ -178,7 +178,7 @@ InitiateSystemShutdownExA(LPSTR lpMachineName, return FALSE; } } - + rv = InitiateSystemShutdownExW(MachineNameW.Buffer, MessageW.Buffer, dwTimeout, diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c index fd7af148cfe..64e87b26186 100644 --- a/reactos/dll/win32/advapi32/reg/reg.c +++ b/reactos/dll/win32/advapi32/reg/reg.c @@ -931,7 +931,7 @@ CreateNestedKey(PHKEY KeyHandle, LocalObjectAttributes.ObjectName = &LocalKeyName; FullNameLength = LocalKeyName.Length / sizeof(WCHAR); - LocalKeyHandle = NULL; + LocalKeyHandle = NULL; /* Remove the last part of the key name and try to create the key again. */ while (Status == STATUS_OBJECT_NAME_NOT_FOUND)