[DESK.CPL]: Fix trailing whitespace, some indent + code formatting style.

svn path=/trunk/; revision=73044

reactos/dll/cpl/desk/classinst.c

@@ -38,7 +38,7 @@ DisplayClassInstaller(
         return ERROR_DI_DO_DEFAULT;
 
     /* Set DI_DONOTCALLCONFIGMG flag */
-    InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+    InstallParams.cbSize = sizeof(InstallParams);
     result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams);
     if (!result)
     {
@@ -67,7 +67,7 @@ DisplayClassInstaller(
     }
 
     /* Get .inf file name and section name */
-    DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA);
+    DriverInfoData.cbSize = sizeof(DriverInfoData);
     result = SetupDiGetSelectedDriver(DeviceInfoSet, DeviceInfoData, &DriverInfoData);
     if (!result)
     {
@@ -76,11 +76,10 @@ DisplayClassInstaller(
         goto cleanup;
     }
 
-    DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
+    DriverInfoDetailData.cbSize = sizeof(DriverInfoDetailData);
-    result = SetupDiGetDriverInfoDetail(
+    result = SetupDiGetDriverInfoDetail(DeviceInfoSet, DeviceInfoData,
-        DeviceInfoSet, DeviceInfoData,
                                         &DriverInfoData, &DriverInfoDetailData,
-        sizeof(SP_DRVINFO_DETAIL_DATA), NULL);
+                                        sizeof(DriverInfoDetailData), NULL);
     if (!result && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
     {
         rc = GetLastError();

reactos/dll/cpl/desk/draw.c

@@ -259,7 +259,7 @@ MyDrawFrameCaption(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme)
         return FALSE;
     }
     MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT, scheme);
-    ZeroMemory(&lf, sizeof(LOGFONT));
+    ZeroMemory(&lf, sizeof(lf));
     MyMakeSquareRect(r, &myr);
     myr.left += 1;
     myr.top += 1;
@@ -330,7 +330,7 @@ MyDrawFrameScroll(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme)
         return FALSE;
     }
     MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT, scheme);
-    ZeroMemory(&lf, sizeof(LOGFONT));
+    ZeroMemory(&lf, sizeof(lf));
     MyMakeSquareRect(r, &myr);
     myr.left += 1;
     myr.top += 1;

reactos/dll/cpl/desk/monslctl.c

@@ -698,7 +698,7 @@ MonSelGetMonitorFont(IN OUT PMONITORSELWND infoPtr,
     hFont = infoPtr->Monitors[Index].hFont;
     if (hFont == NULL &&
         GetObject(infoPtr->hFont,
-                  sizeof(LOGFONT),
+                  sizeof(lf),
                   &lf) != 0)
     {
         rcsize.cx = infoPtr->Monitors[Index].rc.right - infoPtr->Monitors[Index].rc.left -

reactos/dll/cpl/desk/preview.c

@@ -540,7 +540,7 @@ RegisterPreviewControl(IN HINSTANCE hInstance)
 {
     WNDCLASSEX wc = {0};
 
-    wc.cbSize = sizeof(WNDCLASSEX);
+    wc.cbSize = sizeof(wc);
     wc.lpfnWndProc = PreviewWndProc;
     wc.hInstance = hInstance;
     wc.hCursor = LoadCursor(NULL, IDC_ARROW);

reactos/dll/cpl/desk/settings.c

@@ -101,7 +101,7 @@ GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTI
     DeleteDC(hDC);
 
     /* List all settings */
-    devmode.dmSize = (WORD)sizeof(DEVMODE);
+    devmode.dmSize = (WORD)sizeof(devmode);
     devmode.dmDriverExtra = 0;
 
     if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags))
@@ -319,7 +319,7 @@ OnInitDialog(IN HWND hwndDlg)
 
     /* Get video cards list */
     pData->DisplayDeviceList = NULL;
-    displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE);
+    displayDevice.cb = sizeof(displayDevice);
     while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1))
     {
         if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0)
@@ -724,8 +724,8 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar
                     /* Apply new settings */
                     LONG rc;
                     DEVMODE devmode;
-                    RtlZeroMemory(&devmode, sizeof(DEVMODE));
+                    RtlZeroMemory(&devmode, sizeof(devmode));
-                    devmode.dmSize = (WORD)sizeof(DEVMODE);
+                    devmode.dmSize = (WORD)sizeof(devmode);
                     devmode.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth;
                     devmode.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight;
                     devmode.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel;

reactos/dll/cpl/desk/theme.c

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            dll/cpl/desk/theme.c
- * PURPOSE:         Handling themes
+ * PURPOSE:         Handling themes and visual effects
  *
  * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
@@ -154,7 +154,7 @@ LoadCurrentScheme(OUT COLOR_SCHEME *scheme)
     if (!ret) return FALSE;
 
     /* Effects */
-    /* "Use the following transition effect for menus and tooltips" */
+    /* Use the following transition effect for menus and tooltips */
     ret = SystemParametersInfoW(SPI_GETMENUANIMATION,
                                 0,
                                 &scheme->Effects.bMenuAnimation,
@@ -180,7 +180,7 @@ LoadCurrentScheme(OUT COLOR_SCHEME *scheme)
                                 0);
     if (!ret) return FALSE;
 
-    /* "Hide underlined letters for keyboard navigation until I press the Alt key" */
+    /* Hide underlined letters for keyboard navigation until I press the Alt key */
     ret = SystemParametersInfoW(SPI_GETKEYBOARDCUES,
                                 0,
                                 &scheme->Effects.bKeyboardCues,
@@ -286,7 +286,7 @@ LoadSchemeFromReg(OUT COLOR_SCHEME *scheme, IN PTHEME_SELECTION pSelectedTheme)
 }
 
 /*
-    ApplyScheme: Applies the selected scheme and stores its id in the registry if needed
+ * ApplyScheme: Applies the selected scheme and stores its id in the registry if needed
  */
 VOID
 ApplyScheme(IN COLOR_SCHEME *scheme, IN PTHEME_SELECTION pSelectedTheme)
@@ -549,7 +549,7 @@ LoadSchemeSizes(IN HKEY hkScheme)
 }
 
 /*
-    LoadClassicColorSchemes: Returns a list of classic theme colours from the registry key of a scheme
+ * LoadClassicColorSchemes: Returns a list of classic theme colours from the registry key of a scheme
  */
 static THEME_STYLE*
 LoadClassicColorSchemes(VOID)
@@ -664,8 +664,8 @@ EnumThemeProc(IN LPVOID lpReserved,
 }
 
 /*
-    LoadThemes: Returns a list that contains tha classic theme and 
+ * LoadThemes: Returns a list that contains tha classic theme and
-                 the visual styles of the system
+ *             the visual styles of the system
  */
 PTHEME
 LoadThemes()
@@ -749,8 +749,8 @@ GetActiveTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme)
 }
 
 /*
-    GetActiveTheme: Gets the active classic theme and populates pSelectedTheme 
+ * GetActiveTheme: Gets the active classic theme and populates pSelectedTheme
-                    with entries from the list of loaded themes 
+ *                 with entries from the list of loaded themes
  */
 BOOL
 GetActiveClassicTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme)