[tkreuzer] 51146: [USER32] Improve formatting

Author: tkreuzer
Date: Sat Mar 26 01:20:11 2011
New Revision: 51146

URL: http://svn.reactos.org/svn/reactos?rev=51146&view=rev
Log:
[USER32]
Improve formatting

Modified:
    trunk/reactos/dll/win32/user32/misc/display.c

Modified: trunk/reactos/dll/win32/user32/misc/display.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/displ...
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sat Mar 26 01:20:11 2011
@@ -1,29 +1,8 @@
 /*
- *  ReactOS kernel
- *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id$
- *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
  * PURPOSE:         DDE
  * PROGRAMMER:      Casper S. Hornstrup ([e-mail])
- * UPDATE HISTORY:
- *      09-05-2001  CSH  Created
  */

/* INCLUDES ******************************************************************/
@@ -47,49 +26,52 @@
  */
 BOOL WINAPI
 EnumDisplayDevicesA(
-  LPCSTR lpDevice,
-  DWORD iDevNum,
-  PDISPLAY_DEVICEA lpDisplayDevice,
-  DWORD dwFlags)
-{
-  BOOL rc;
-  UNICODE_STRING Device;
-  DISPLAY_DEVICEW DisplayDeviceW;
-
-  if ( !RtlCreateUnicodeStringFromAsciiz ( &Device, (PCSZ)lpDevice ) )
-    {
-      SetLastError ( ERROR_OUTOFMEMORY );
-      return FALSE;
-    }
-
-  RtlZeroMemory(&DisplayDeviceW, sizeof(DISPLAY_DEVICEW));
-  DisplayDeviceW.cb = sizeof(DISPLAY_DEVICEW);
-  rc = NtUserEnumDisplayDevices (
-    &Device,
-    iDevNum,
-    &DisplayDeviceW,
-    dwFlags );
-  if (rc)
-    {
-      /* Copy result from DisplayDeviceW to lpDisplayDevice. Buffers have the same size so result is always NULL terminated. */
-      lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags;
-      WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceName, -1,
-        lpDisplayDevice->DeviceName, sizeof(lpDisplayDevice->DeviceName) / sizeof(lpDisplayDevice->DeviceName[0]),
-        NULL, NULL);
-      WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceString, -1,
-        lpDisplayDevice->DeviceString, sizeof(lpDisplayDevice->DeviceString) / sizeof(lpDisplayDevice->DeviceString[0]),
-        NULL, NULL);
-      WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceID, -1,
-        lpDisplayDevice->DeviceID, sizeof(lpDisplayDevice->DeviceID) / sizeof(lpDisplayDevice->DeviceID[0]),
-        NULL, NULL);
-      WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceKey, -1,
-        lpDisplayDevice->DeviceKey, sizeof(lpDisplayDevice->DeviceKey) / sizeof(lpDisplayDevice->DeviceKey[0]),
-        NULL, NULL);
-    }
-
-  RtlFreeUnicodeString ( &Device );
-
-  return rc;
+    LPCSTR lpDevice,
+    DWORD iDevNum,
+    PDISPLAY_DEVICEA lpDisplayDevice,
+    DWORD dwFlags)
+{
+    BOOL rc;
+    UNICODE_STRING Device;
+    DISPLAY_DEVICEW DisplayDeviceW;
+
+    if (!RtlCreateUnicodeStringFromAsciiz(&Device, (PCSZ)lpDevice))
+    {
+        SetLastError(ERROR_OUTOFMEMORY);
+        return FALSE;
+    }
+
+    RtlZeroMemory(&DisplayDeviceW, sizeof(DISPLAY_DEVICEW));
+    DisplayDeviceW.cb = sizeof(DISPLAY_DEVICEW);
+    rc = NtUserEnumDisplayDevices(&Device,
+                                  iDevNum,
+                                  &DisplayDeviceW,
+                                  dwFlags);
+    if (rc)
+    {
+        /* Copy result from DisplayDeviceW to lpDisplayDevice. Buffers have the same size so result is always NULL terminated. */
+        lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags;
+        WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceName, -1,
+                            lpDisplayDevice->DeviceName,
+                            sizeof(lpDisplayDevice->DeviceName) / sizeof(lpDisplayDevice->DeviceName[0]),
+                            NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceString, -1,
+                            lpDisplayDevice->DeviceString,
+                            sizeof(lpDisplayDevice->DeviceString) / sizeof(lpDisplayDevice->DeviceString[0]),
+                            NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceID, -1,
+                            lpDisplayDevice->DeviceID,
+                            sizeof(lpDisplayDevice->DeviceID) / sizeof(lpDisplayDevice->DeviceID[0]),
+                            NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, DisplayDeviceW.DeviceKey, -1,
+                            lpDisplayDevice->DeviceKey,
+                            sizeof(lpDisplayDevice->DeviceKey) / sizeof(lpDisplayDevice->DeviceKey[0]),
+                            NULL, NULL);
+    }
+
+    RtlFreeUnicodeString(&Device);
+
+    return rc;
 }

@@ -99,23 +81,23 @@
 BOOL
 WINAPI
 EnumDisplayDevicesW(
-  LPCWSTR lpDevice,
-  DWORD iDevNum,
-  PDISPLAY_DEVICE lpDisplayDevice,
-  DWORD dwFlags)
-{
-  UNICODE_STRING Device;
-  BOOL rc;
-
-  RtlInitUnicodeString ( &Device, lpDevice );
-
-  rc = NtUserEnumDisplayDevices (
-    &Device,
-    iDevNum,
-    lpDisplayDevice,
-    dwFlags );
-
-  return rc;
+    LPCWSTR lpDevice,
+    DWORD iDevNum,
+    PDISPLAY_DEVICE lpDisplayDevice,
+    DWORD dwFlags)
+{
+    UNICODE_STRING Device;
+    BOOL rc;
+
+    RtlInitUnicodeString(&Device, lpDevice);
+
+    rc = NtUserEnumDisplayDevices(
+             &Device,
+             iDevNum,
+             lpDisplayDevice,
+             dwFlags);
+
+    return rc;
 }

@@ -125,71 +107,71 @@
 BOOL
 WINAPI
 EnumDisplayMonitors(
-  HDC hdc,
-  LPCRECT lprcClip,
-  MONITORENUMPROC lpfnEnum,
-  LPARAM dwData)
-{
-  INT iCount, i;
-  HMONITOR *hMonitorList;
-  LPRECT pRectList;
-  HANDLE hHeap;
-
-  /* get list of monitors/rects */
-  iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, NULL, NULL, 0);
-  if (iCount < 0)
-    {
-      /* FIXME: SetLastError() */
-      return FALSE;
-    }
-  if (iCount == 0)
-    {
-      return TRUE;
-    }
-
-  hHeap = GetProcessHeap();
-  hMonitorList = HeapAlloc(hHeap, 0, sizeof (HMONITOR) * iCount);
-  if (hMonitorList == NULL)
-    {
-      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-  pRectList = HeapAlloc(hHeap, 0, sizeof (RECT) * iCount);
-  if (pRectList == NULL)
-    {
-      HeapFree(hHeap, 0, hMonitorList);
-      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-  iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, hMonitorList, pRectList, iCount);
-  if (iCount <= 0)
-    {
-      /* FIXME: SetLastError() */
-      HeapFree(hHeap, 0, hMonitorList);
-      HeapFree(hHeap, 0, pRectList);
-      return FALSE;
-    }
-
-  /* enumerate list */
-  for (i = 0; i < iCount; i++)
-    {
-      HMONITOR hMonitor = hMonitorList[i];
-      LPRECT pMonitorRect = pRectList + i;
-      HDC hMonitorDC = NULL;
-
-      if (hdc != NULL)
+    HDC hdc,
+    LPCRECT lprcClip,
+    MONITORENUMPROC lpfnEnum,
+    LPARAM dwData)
+{
+    INT iCount, i;
+    HMONITOR *hMonitorList;
+    LPRECT pRectList;
+    HANDLE hHeap;
+
+    /* get list of monitors/rects */
+    iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, NULL, NULL, 0);
+    if (iCount < 0)
+    {
+        /* FIXME: SetLastError() */
+        return FALSE;
+    }
+    if (iCount == 0)
+    {
+        return TRUE;
+    }
+
+    hHeap = GetProcessHeap();
+    hMonitorList = HeapAlloc(hHeap, 0, sizeof (HMONITOR) * iCount);
+    if (hMonitorList == NULL)
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
+    }
+    pRectList = HeapAlloc(hHeap, 0, sizeof (RECT) * iCount);
+    if (pRectList == NULL)
+    {
+        HeapFree(hHeap, 0, hMonitorList);
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
+    }
+
+    iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, hMonitorList, pRectList, iCount);
+    if (iCount <= 0)
+    {
+        /* FIXME: SetLastError() */
+        HeapFree(hHeap, 0, hMonitorList);
+        HeapFree(hHeap, 0, pRectList);
+        return FALSE;
+    }
+
+    /* enumerate list */
+    for (i = 0; i < iCount; i++)
+    {
+        HMONITOR hMonitor = hMonitorList[i];
+        LPRECT pMonitorRect = pRectList + i;
+        HDC hMonitorDC = NULL;
+
+        if (hdc != NULL)
         {
-          /* make monitor DC */
-          hMonitorDC = hdc;
+            /* make monitor DC */
+            hMonitorDC = hdc;
         }

-      if (!lpfnEnum(hMonitor, hMonitorDC, pMonitorRect, dwData))
-        break;
-    }
-  HeapFree(hHeap, 0, hMonitorList);
-  HeapFree(hHeap, 0, pRectList);
-  return TRUE;
+        if (!lpfnEnum(hMonitor, hMonitorDC, pMonitorRect, dwData))
+            break;
+    }
+    HeapFree(hHeap, 0, hMonitorList);
+    HeapFree(hHeap, 0, pRectList);
+    return TRUE;
 }

@@ -240,13 +222,13 @@
     COPYN(dmDriverVersion);
     switch (lpDevMode->dmSize)
     {
-        case SIZEOF_DEVMODEA_300:
-        case SIZEOF_DEVMODEA_400:
-        case SIZEOF_DEVMODEA_500:
-             break;
-        default:
-            lpDevMode->dmSize = SIZEOF_DEVMODEA_300;
-            break;
+    case SIZEOF_DEVMODEA_300:
+    case SIZEOF_DEVMODEA_400:
+    case SIZEOF_DEVMODEA_500:
+        break;
+    default:
+        lpDevMode->dmSize = SIZEOF_DEVMODEA_300;
+        break;
     }
     COPYN(dmDriverExtra);
     COPYN(dmFields);
@@ -295,11 +277,11 @@
 BOOL
 WINAPI
 EnumDisplaySettingsA(
-  LPCSTR lpszDeviceName,
-  DWORD iModeNum,
-  LPDEVMODEA lpDevMode)
-{
-  return EnumDisplaySettingsExA ( lpszDeviceName, iModeNum, lpDevMode, 0 );
+    LPCSTR lpszDeviceName,
+    DWORD iModeNum,
+    LPDEVMODEA lpDevMode)
+{
+    return EnumDisplaySettingsExA ( lpszDeviceName, iModeNum, lpDevMode, 0 );
 }

@@ -335,11 +317,11 @@
 BOOL
 WINAPI
 EnumDisplaySettingsW(
-  LPCWSTR lpszDeviceName,
-  DWORD iModeNum,
-  LPDEVMODEW lpDevMode)
-{
-  return EnumDisplaySettingsExW ( lpszDeviceName, iModeNum, lpDevMode, 0 );
+    LPCWSTR lpszDeviceName,
+    DWORD iModeNum,
+    LPDEVMODEW lpDevMode)
+{
+    return EnumDisplaySettingsExW ( lpszDeviceName, iModeNum, lpDevMode, 0 );
 }

@@ -349,40 +331,40 @@
 BOOL
 WINAPI
 GetMonitorInfoA(
-  HMONITOR hMonitor,
-  LPMONITORINFO lpmi)
-{
-  if (lpmi->cbSize == sizeof (MONITORINFO))
-    {
-      return NtUserGetMonitorInfo(hMonitor, lpmi);
-    }
-  else if (lpmi->cbSize != sizeof (MONITORINFOEXA))
-    {
-      SetLastError(ERROR_INVALID_PARAMETER);
-      return FALSE;
-    }
-  else
-    {
-      MONITORINFOEXW miExW;
-      INT res;
-
-      miExW.cbSize = sizeof (MONITORINFOEXW);
-      if (!NtUserGetMonitorInfo(hMonitor, (LPMONITORINFO)&miExW))
+    HMONITOR hMonitor,
+    LPMONITORINFO lpmi)
+{
+    if (lpmi->cbSize == sizeof (MONITORINFO))
+    {
+        return NtUserGetMonitorInfo(hMonitor, lpmi);
+    }
+    else if (lpmi->cbSize != sizeof (MONITORINFOEXA))
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    else
+    {
+        MONITORINFOEXW miExW;
+        INT res;
+
+        miExW.cbSize = sizeof (MONITORINFOEXW);
+        if (!NtUserGetMonitorInfo(hMonitor, (LPMONITORINFO)&miExW))
         {
-          return FALSE;
+            return FALSE;
         }
-      memcpy(lpmi, &miExW, sizeof (MONITORINFO));
-      res = WideCharToMultiByte(CP_THREAD_ACP, 0, miExW.szDevice, -1,
-                                ((LPMONITORINFOEXA)lpmi)->szDevice, CCHDEVICENAME,
-                                NULL, NULL);
-      if (res == 0)
+        memcpy(lpmi, &miExW, sizeof (MONITORINFO));
+        res = WideCharToMultiByte(CP_THREAD_ACP, 0, miExW.szDevice, -1,
+                                  ((LPMONITORINFOEXA)lpmi)->szDevice, CCHDEVICENAME,
+                                  NULL, NULL);
+        if (res == 0)
         {
-          WARN("WideCharToMultiByte() failed!\n");
-          return FALSE;
+            WARN("WideCharToMultiByte() failed!\n");
+            return FALSE;
         }
     }

-  return TRUE;
+    return TRUE;
 }

@@ -392,10 +374,10 @@
 BOOL
 WINAPI
 GetMonitorInfoW(
-  HMONITOR hMonitor,
-  LPMONITORINFO lpmi)
-{
-  return NtUserGetMonitorInfo(hMonitor, lpmi);
+    HMONITOR hMonitor,
+    LPMONITORINFO lpmi)
+{
+    return NtUserGetMonitorInfo(hMonitor, lpmi);
 }

@@ -405,10 +387,10 @@
 HMONITOR
 WINAPI
 MonitorFromPoint(
-	IN POINT ptPoint,
-	IN DWORD dwFlags )
-{
-  return NtUserMonitorFromPoint(ptPoint, dwFlags);
+    IN POINT ptPoint,
+    IN DWORD dwFlags )
+{
+    return NtUserMonitorFromPoint(ptPoint, dwFlags);
 }

@@ -418,10 +400,10 @@
 HMONITOR
 WINAPI
 MonitorFromRect(
-	IN LPCRECT lpcRect,
-	IN DWORD dwFlags )
-{
-  return NtUserMonitorFromRect(lpcRect, dwFlags);
+    IN LPCRECT lpcRect,
+    IN DWORD dwFlags )
+{
+    return NtUserMonitorFromRect(lpcRect, dwFlags);
 }

@@ -431,10 +413,10 @@
 HMONITOR
 WINAPI
 MonitorFromWindow(
-	IN HWND hWnd,
-	IN DWORD dwFlags )
-{
-  return NtUserMonitorFromWindow(hWnd, dwFlags);
+    IN HWND hWnd,
+    IN DWORD dwFlags )
+{
+    return NtUserMonitorFromWindow(hWnd, dwFlags);
 }

@@ -444,46 +426,46 @@
 LONG
 WINAPI
 ChangeDisplaySettingsExA(
-  LPCSTR lpszDeviceName,
-  LPDEVMODEA lpDevMode,
-  HWND hwnd,
-  DWORD dwflags,
-  LPVOID lParam)
-{
-  LONG rc;
-  UNICODE_STRING DeviceName;
-  PUNICODE_STRING pDeviceName = &DeviceName;
-
-  if (lpszDeviceName != NULL)
-    {
-      if ( !RtlCreateUnicodeStringFromAsciiz ( pDeviceName, (PCSZ)lpszDeviceName ) )
+    LPCSTR lpszDeviceName,
+    LPDEVMODEA lpDevMode,
+    HWND hwnd,
+    DWORD dwflags,
+    LPVOID lParam)
+{
+    LONG rc;
+    UNICODE_STRING DeviceName;
+    PUNICODE_STRING pDeviceName = &DeviceName;
+
+    if (lpszDeviceName != NULL)
+    {
+        if (!RtlCreateUnicodeStringFromAsciiz(pDeviceName, (PCSZ)lpszDeviceName))
         {
-          SetLastError ( ERROR_OUTOFMEMORY );
-          return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
+            SetLastError(ERROR_OUTOFMEMORY);
+            return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
         }
     }
-  else
-    pDeviceName = NULL;
-
-  if (lpDevMode != NULL)
-  {
-    LPDEVMODEW pDevModeW;
-    pDevModeW = GdiConvertToDevmodeW(lpDevMode);
-    if(pDevModeW)
-    {
-      rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam );
-      RtlFreeHeap(GetProcessHeap(), 0, pDevModeW);
-    }
     else
-      rc = DISP_CHANGE_SUCCESSFUL;
-  }
-  else
-    rc = NtUserChangeDisplaySettings ( pDeviceName, NULL, hwnd, dwflags, lParam );
-
-  if (lpszDeviceName != NULL)
-    RtlFreeUnicodeString ( &DeviceName );
-
-  return rc;
+        pDeviceName = NULL;
+
+    if (lpDevMode != NULL)
+    {
+        LPDEVMODEW pDevModeW;
+        pDevModeW = GdiConvertToDevmodeW(lpDevMode);
+        if(pDevModeW)
+        {
+            rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags, lParam);
+            RtlFreeHeap(GetProcessHeap(), 0, pDevModeW);
+        }
+        else
+            rc = DISP_CHANGE_SUCCESSFUL;
+    }
+    else
+        rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags, lParam);
+
+    if (lpszDeviceName != NULL)
+        RtlFreeUnicodeString(&DeviceName);
+
+    return rc;
 }

@@ -493,12 +475,12 @@
 LONG
 WINAPI
 ChangeDisplaySettingsA(
-  LPDEVMODEA lpDevMode,
-  DWORD dwflags)
-{
-  if(lpDevMode)
-    lpDevMode->dmDriverExtra = 0;
-  return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 );
+    LPDEVMODEA lpDevMode,
+    DWORD dwflags)
+{
+    if(lpDevMode)
+        lpDevMode->dmDriverExtra = 0;
+    return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 );
 }

@@ -508,24 +490,24 @@
 LONG
 WINAPI
 ChangeDisplaySettingsExW(
-  LPCWSTR lpszDeviceName,
-  LPDEVMODEW lpDevMode,
-  HWND hwnd,
-  DWORD dwflags,
-  LPVOID lParam)
-{
-  LONG rc;
-  UNICODE_STRING DeviceName;
-  PUNICODE_STRING pDeviceName = &DeviceName;
-
-  if (lpszDeviceName != NULL)
-    RtlInitUnicodeString ( pDeviceName, lpszDeviceName );
-  else
-    pDeviceName = NULL;
-
-  rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam );
-
-  return rc;
+    LPCWSTR lpszDeviceName,
+    LPDEVMODEW lpDevMode,
+    HWND hwnd,
+    DWORD dwflags,
+    LPVOID lParam)
+{
+    LONG rc;
+    UNICODE_STRING DeviceName;
+    PUNICODE_STRING pDeviceName = &DeviceName;
+
+    if (lpszDeviceName != NULL)
+        RtlInitUnicodeString(pDeviceName, lpszDeviceName);
+    else
+        pDeviceName = NULL;
+
+    rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags, lParam);
+
+    return rc;
 }

@@ -535,10 +517,10 @@
 LONG
 WINAPI
 ChangeDisplaySettingsW(
-  LPDEVMODEW lpDevMode,
-  DWORD dwflags)
-{
-  if(lpDevMode)
-    lpDevMode->dmDriverExtra = 0;
-  return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 );
-}
+    LPDEVMODEW lpDevMode,
+    DWORD dwflags)
+{
+    if(lpDevMode)
+        lpDevMode->dmDriverExtra = 0;
+    return ChangeDisplaySettingsExW(NULL, lpDevMode, NULL, dwflags, 0);
+}