Reverted some coding-style changes as per Alekseys request.

svn path=/trunk/; revision=45019

reactos/dll/win32/kernel32/process/proc.c

@@ -848,16 +848,16 @@ GetProcessVersion(DWORD ProcessId)
                                                &ProcessBasicInfo,
                                                sizeof(ProcessBasicInfo),
                                                NULL);
-            if (!NT_SUCCESS(Status))
+
-                goto Error;
+            if (!NT_SUCCESS(Status)) goto Error;
 
             Status = NtReadVirtualMemory(ProcessHandle,
                                          ProcessBasicInfo.PebBaseAddress,
                                          &Peb,
                                          sizeof(Peb),
                                          &Count);
-            if (!NT_SUCCESS(Status) || Count != sizeof(Peb))
+
-                goto Error;
+            if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) goto Error;
 
             memset(&DosHeader, 0, sizeof(DosHeader));
             Status = NtReadVirtualMemory(ProcessHandle,
@@ -866,11 +866,8 @@ GetProcessVersion(DWORD ProcessId)
                                          sizeof(DosHeader),
                                          &Count);
 
-            if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader))
+            if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) goto Error;
-                goto Error;
+            if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) goto Error;
-
-            if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE)
-                goto Error;
 
             memset(&NtHeaders, 0, sizeof(NtHeaders));
             Status = NtReadVirtualMemory(ProcessHandle,
@@ -879,11 +876,8 @@ GetProcessVersion(DWORD ProcessId)
                                          sizeof(NtHeaders),
                                          &Count);
 
-            if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders))
+            if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) goto Error;
-                goto Error;
+            if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) goto Error;
-
-            if (NtHeaders.Signature != IMAGE_NT_SIGNATURE)
-                goto Error;
 
             Version = MAKELONG(NtHeaders.OptionalHeader.MinorSubsystemVersion,
                                NtHeaders.OptionalHeader.MajorSubsystemVersion);
@@ -897,8 +891,7 @@ Error:
     }
     _SEH2_FINALLY
     {
-        if (ProcessHandle)
+        if (ProcessHandle) CloseHandle(ProcessHandle);
-            CloseHandle(ProcessHandle);
     }
     _SEH2_END;
 
@@ -1075,11 +1068,9 @@ QueryFullProcessImageNameW(HANDLE hProcess,
                                            &Needed);
         Result = DynamicBuffer;
     }
-    else
+    else Result = (PUNICODE_STRING)Buffer;
-        Result = (PUNICODE_STRING)Buffer;
 
-    if (!NT_SUCCESS(Status))
+    if (!NT_SUCCESS(Status)) goto Cleanup;
-        goto Cleanup;
 
     if (Result->Length / sizeof(WCHAR) + 1 > *pdwSize)
     {

reactos/dll/win32/kernel32/process/procsup.c

@@ -294,8 +294,7 @@ BasepDuplicateAndWriteHandle(IN HANDLE ProcessHandle,
            "Address: %p\n", ProcessHandle, StandardHandle, Address);
 
     /* Don't touch Console Handles */
-    if (IsConsoleHandle(StandardHandle))
+    if (IsConsoleHandle(StandardHandle)) return;
-        return;
 
     /* Duplicate the handle */
     Status = NtDuplicateObject(NtCurrentProcess(),
@@ -1018,8 +1017,7 @@ GetAppName:
             CmdLineLength = wcslen(CMD_STRING) + wcslen(lpCommandLine) + 1;
 
             /* If we found quotes, then add them into the length size */
-            if (CmdLineIsAppName || FoundQuotes)
+            if (CmdLineIsAppName || FoundQuotes) CmdLineLength += 2;
-                CmdLineLength += 2;
             CmdLineLength *= sizeof(WCHAR);
 
             /* Allocate space for the new command line */
@@ -1313,8 +1311,7 @@ GetAppName:
     if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT))
     {
         lpEnvironment = BasepConvertUnicodeEnvironment(&EnvSize, lpEnvironment);
-        if (!lpEnvironment)
+        if (!lpEnvironment) goto Cleanup;
-            goto Cleanup;
     }
 
     /* Create Process Environment */
@@ -1422,31 +1419,21 @@ GetAppName:
 
 Cleanup:
     /* De-allocate heap strings */
-    if (NameBuffer)
+    if (NameBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer);
-        RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer);
-
     if (ApplicationName.Buffer)
         RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer);
-
+    if (CurrentDirectory) RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory);
-    if (CurrentDirectory)
+    if (QuotedCmdLine) RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine);
-        RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory);
-
-    if (QuotedCmdLine)
-        RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine);
 
     /* Kill any handles still alive */
-    if (hSection)
+    if (hSection) NtClose(hSection);
-        NtClose(hSection);
-
     if (hThread)
     {
         /* We don't know any more details then this */
         NtTerminateProcess(hProcess, STATUS_UNSUCCESSFUL);
         NtClose(hThread);
     }
-
+    if (hProcess) NtClose(hProcess);
-    if (hProcess)
-        NtClose(hProcess);
 
     /* Return Success */
     return Ret;

reactos/dll/win32/kernel32/synch/critical.c

@@ -26,9 +26,8 @@ InitializeCriticalSection(OUT LPCRITICAL_SECTION lpCriticalSection)
 
     /* Initialize the critical section and raise an exception if we failed */
     Status = RtlInitializeCriticalSection(
-       (PRTL_CRITICAL_SECTION)lpCriticalSection);
+        (PRTL_CRITICAL_SECTION)lpCriticalSection);
-    if (!NT_SUCCESS(Status))
+    if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status);
-        RtlRaiseStatus(Status);
 }
 
 /*

reactos/dll/win32/kernel32/synch/mutex.c

@@ -75,8 +75,7 @@ CreateMutexExW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes  OPTIONAL,
     BOOLEAN InitialOwner;
 
     /* Now check if we got a name */
-    if (lpName)
+    if (lpName) RtlInitUnicodeString(&ObjectName, lpName);
-        RtlInitUnicodeString(&ObjectName, lpName);
 
     if (dwFlags & ~(CREATE_MUTEX_INITIAL_OWNER))
     {
@@ -258,8 +257,7 @@ ReleaseMutex(IN HANDLE hMutex)
 
     /* Release the mutant */
     Status = NtReleaseMutant(hMutex, NULL);
-    if (NT_SUCCESS(Status))
+    if (NT_SUCCESS(Status)) return TRUE;
-        return TRUE;
 
     /* If we got here, then we failed */
     SetLastErrorByStatus(Status);

reactos/dll/win32/kernel32/synch/sem.c

@@ -80,8 +80,7 @@ CreateSemaphoreExW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes  OPTIONAL,
     UNICODE_STRING ObjectName;
 
     /* Now check if we got a name */
-    if (lpName)
+    if (lpName) RtlInitUnicodeString(&ObjectName, lpName);
-        RtlInitUnicodeString(&ObjectName, lpName);
 
     if (dwFlags != 0)
     {
@@ -261,8 +260,7 @@ ReleaseSemaphore(IN HANDLE hSemaphore,
 
     /* Release the semaphore */
     Status = NtReleaseSemaphore(hSemaphore, lReleaseCount, lpPreviousCount);
-    if (NT_SUCCESS(Status))
+    if (NT_SUCCESS(Status)) return TRUE;
-        return TRUE;
 
     /* If we got here, then we failed */
     SetLastErrorByStatus(Status);

reactos/dll/win32/kernel32/synch/timer.c

@@ -75,8 +75,7 @@ CreateWaitableTimerExW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes  OPTIONAL,
     TIMER_TYPE TimerType;
 
     /* Now check if we got a name */
-    if (lpTimerName)
+    if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName);
-        RtlInitUnicodeString(&ObjectName, lpTimerName);
 
     if (dwFlags & ~(CREATE_WAITABLE_TIMER_MANUAL_RESET))
     {
@@ -269,8 +268,7 @@ SetWaitableTimer(IN HANDLE hTimer,
                         (BOOLEAN)fResume,
                         lPeriod,
                         NULL);
-    if (NT_SUCCESS(Status))
+    if (NT_SUCCESS(Status)) return TRUE;
-        return TRUE;
 
     /* If we got here, then we failed */
     SetLastErrorByStatus(Status);
@@ -288,8 +286,7 @@ CancelWaitableTimer(IN HANDLE hTimer)
 
     /* Cancel the timer */
     Status = NtCancelTimer(hTimer, NULL);
-    if (NT_SUCCESS(Status))
+    if (NT_SUCCESS(Status)) return TRUE;
-        return TRUE;
 
     /* If we got here, then we failed */
     SetLastErrorByStatus(Status);

reactos/dll/win32/kernel32/thread/fiber.c

@@ -69,8 +69,7 @@ ConvertThreadToFiberEx(LPVOID lpParameter,
     DPRINT1("Converting Thread to Fiber\n");
 
     /* the current thread is already a fiber */
-    if (pTeb->HasFiberData && pTeb->Tib.FiberData)
+    if(pTeb->HasFiberData && pTeb->Tib.FiberData) return pTeb->Tib.FiberData;
-        return pTeb->Tib.FiberData;
 
     /* allocate the fiber */
     pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), 
@@ -228,8 +227,7 @@ DeleteFiber(LPVOID lpFiber)
     RtlFreeHeap(GetProcessHeap(), 0, lpFiber);
 
     /* the fiber is deleting itself: let the system deallocate the stack */
-    if (NtCurrentTeb()->Tib.FiberData == lpFiber)
+    if(NtCurrentTeb()->Tib.FiberData == lpFiber) ExitThread(1);
-        ExitThread(1);
 
     /* deallocate the stack */
     NtFreeVirtualMemory(NtCurrentProcess(),

reactos/dll/win32/kernel32/thread/fls.c

@@ -55,13 +55,11 @@ FlsGetValue(DWORD dwFlsIndex)
     PVOID *ppFlsSlots;
     PVOID pRetVal;
 
-    if (dwFlsIndex >= 128)
+    if(dwFlsIndex >= 128) goto l_InvalidParam;
-        goto l_InvalidParam;
 
     ppFlsSlots = NtCurrentTeb()->FlsData;
 
-    if (ppFlsSlots == NULL)
+    if(ppFlsSlots == NULL) goto l_InvalidParam;
-        goto l_InvalidParam;
 
     SetLastError(0);
     pRetVal = ppFlsSlots[dwFlsIndex + 2];
@@ -84,8 +82,7 @@ FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData)
     PVOID *ppFlsSlots;
     TEB *pTeb = NtCurrentTeb();
 
-    if (dwFlsIndex >= 128)
+    if(dwFlsIndex >= 128) goto l_InvalidParam;
-        goto l_InvalidParam;
 
     ppFlsSlots = pTeb->FlsData;
 
@@ -96,8 +93,7 @@ FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData)
         ppFlsSlots = RtlAllocateHeap(pPeb->ProcessHeap,
                                      HEAP_ZERO_MEMORY,
                                      (128 + 2) * sizeof(PVOID));
-        if (ppFlsSlots == NULL)
+        if(ppFlsSlots == NULL) goto l_OutOfMemory;
-            goto l_OutOfMemory;
 
         pTeb->FlsData = ppFlsSlots;