comdlg32: Indentation fix

Andrew Talbot andrew.talbot at talbotville.com
Sat May 24 10:36:50 CDT 2008


Changelog:
    comdlg32: Indentation fix

diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index 1b4c0d5..8c8ce59 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -163,11 +163,11 @@ int CC_RGBtoHSL(char c, int r, int g, int b)
 	   else
 	    if (!mini || maxi == 255)
 	     result = 240;
-	   else
-	   {
-	    result = mmdif * 240;       /* 0...61200=255*240 */
-	    result /= (mmsum > 255 ? mmsum = 510 - mmsum : mmsum); /* 0..255 */
-	   }
+	    else
+	    {
+	     result = mmdif * 240;       /* 0...61200=255*240 */
+	     result /= (mmsum > 255 ? mmsum = 510 - mmsum : mmsum); /* 0..255 */
+	    }
 	   break;
   /* hue */
   case 'H': if (!mmdif)
@@ -993,7 +993,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode,
 			    CC_PaintTriangle(hDlg, lpp->l);
 			   }
 			 }
-		 break;
+	       break;
 
 	  case 0x2bf:  /* edit notify HSL */
 	  case 0x2c0:
diff --git a/dlls/comdlg32/colordlg16.c b/dlls/comdlg32/colordlg16.c
index adbcf98..0d3c357 100644
--- a/dlls/comdlg32/colordlg16.c
+++ b/dlls/comdlg32/colordlg16.c
@@ -228,7 +228,7 @@ static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD not
 			    CC_PaintTriangle(hDlg, lpp->l);
 			   }
 			 }
-		 break;
+	       break;
 
 	  case 0x2bf:  /* edit notify HSL */
 	  case 0x2c0:
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index f64fca7..e177190 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -555,17 +555,17 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
     INT help_fixup = 0, child_height_fixup = 0, child_width_fixup = 0;
 
     /* Take into account if open as read only checkbox and help button
-     * are hidden
-     */
-     if (hide_help)
-     {
-         RECT rectHelp, rectCancel;
-         GetWindowRect(GetDlgItem(hwndParentDlg, pshHelp), &rectHelp);
-         GetWindowRect(GetDlgItem(hwndParentDlg, IDCANCEL), &rectCancel);
-         /* subtract the height of the help button plus the space between
-          * the help button and the cancel button to the height of the dialog
-          */
-          help_fixup = rectHelp.bottom - rectCancel.bottom;
+    * are hidden
+    */
+    if (hide_help)
+    {
+        RECT rectHelp, rectCancel;
+        GetWindowRect(GetDlgItem(hwndParentDlg, pshHelp), &rectHelp);
+        GetWindowRect(GetDlgItem(hwndParentDlg, IDCANCEL), &rectCancel);
+        /* subtract the height of the help button plus the space between
+       * the help button and the cancel button to the height of the dialog
+       */
+        help_fixup = rectHelp.bottom - rectCancel.bottom;
     }
 
     /*
@@ -578,8 +578,7 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
       in the window and the cx and cy indicate how to size the window.
       Moreover, if the new component's coordinates are on the left of the stc32 , it is placed on the left 
       of the standard file dialog box. If they are above the stc32 component, it is placed above and so on....
-      
-     */
+   */
 
     GetClientRect(hwndParentDlg, &rectParent);
 
@@ -1413,8 +1412,8 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam)
       flags |= SWP_NOSIZE;
       SetRectEmpty(&rc);
     }
-      SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
-          0, 0, rc.right, rc.bottom, flags);
+    SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
+                 0, 0, rc.right, rc.bottom, flags);
   }
   else
   {
diff --git a/dlls/comdlg32/filedlg16.c b/dlls/comdlg32/filedlg16.c
index a722a2b..dc2e947 100644
--- a/dlls/comdlg32/filedlg16.c
+++ b/dlls/comdlg32/filedlg16.c
@@ -389,43 +389,43 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L
 
  TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
  if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
+ {
+  LRESULT  lRet;
+  lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
+  if (lRet)
+   return lRet;         /* else continue message processing */
+ }
+ switch (wMsg) {
+  case WM_INITDIALOG:
+     return FD31_WMInitDialog(hWnd, wParam, lParam);
+
+  case WM_MEASUREITEM:
+     return FD16_WMMeasureItem(hWnd16, wParam, lParam);
+
+  case WM_DRAWITEM:
+     FD16_MapDrawItemStruct(MapSL(lParam), &dis);
+     return FD31_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis);
+
+  case WM_COMMAND:
+     return FD31_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
+ }
+
+ /*
+ case WM_CTLCOLOR:
+  SetBkColor((HDC16)wParam, 0x00C0C0C0);
+  switch (HIWORD(lParam))
   {
-   LRESULT  lRet;
-   lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
-   if (lRet)
-    return lRet;         /* else continue message processing */
+   case CTLCOLOR_BTN:
+    SetTextColor((HDC16)wParam, 0x00000000);
+    return hGRAYBrush;
+   case CTLCOLOR_STATIC:
+    SetTextColor((HDC16)wParam, 0x00000000);
+    return hGRAYBrush;
   }
-  switch (wMsg) {
-   case WM_INITDIALOG:
-      return FD31_WMInitDialog(hWnd, wParam, lParam);
-
-   case WM_MEASUREITEM:
-      return FD16_WMMeasureItem(hWnd16, wParam, lParam);
-
-   case WM_DRAWITEM:
-      FD16_MapDrawItemStruct(MapSL(lParam), &dis);
-      return FD31_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis);
-
-   case WM_COMMAND:
-      return FD31_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
-  }
-
-  /*
-  case WM_CTLCOLOR:
-   SetBkColor((HDC16)wParam, 0x00C0C0C0);
-   switch (HIWORD(lParam))
-   {
-    case CTLCOLOR_BTN:
-     SetTextColor((HDC16)wParam, 0x00000000);
-     return hGRAYBrush;
-    case CTLCOLOR_STATIC:
-     SetTextColor((HDC16)wParam, 0x00000000);
-     return hGRAYBrush;
-   }
-   return FALSE;
-
-   */
   return FALSE;
+
+  */
+ return FALSE;
 }
 
 /* ------------------ APIs ---------------------- */
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index c8fcf7e..459ffea 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -172,8 +172,9 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath)
             while (*filter == ' ') filter++;
 	    TRACE("Using file spec %s\n", debugstr_w(filter));
 	    SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter);
-	    if (scptr) *scptr = ';';
-	        filter = (scptr) ? (scptr + 1) : 0;
+	    if (scptr)
+	        *scptr = ';';
+	    filter = (scptr) ? (scptr + 1) : 0;
 	 }
     }
 



More information about the wine-patches mailing list