Changeset 6645 for trunk/src

Timestamp:

Sep 5, 2001, 2:14:25 PM (24 years ago)

Author:

bird

Message:

Added $Id:$ keyword.

Location:

trunk/src

Files:

• comdlg32/colordlg.c (modified) (44 diffs)
• comdlg32/filedlg.c (modified) (64 diffs)
• comdlg32/filedlg95.c (modified) (97 diffs)
• comdlg32/filedlgbrowser.c (modified) (41 diffs)
• comdlg32/filetitle.c (modified) (4 diffs)
• comdlg32/finddlg32.c (modified) (14 diffs)
• comdlg32/fontdlg.c (modified) (39 diffs)
• comdlg32/initcomdlg32.cpp (modified) (3 diffs)
• comdlg32/initterm.cpp (modified) (2 diffs)
• comdlg32/printdlg.c (modified) (82 diffs)
• crtdll/crtdll.cpp (modified) (58 diffs)
• crtdll/crtdll_main.c (modified) (35 diffs)
• crtdll/dir.c (modified) (18 diffs)
• crtdll/exit.c (modified) (13 diffs)
• crtdll/file.c (modified) (51 diffs)
• crtdll/initterm.cpp (modified) (3 diffs)
• crtdll/memory.c (modified) (8 diffs)
• crtdll/spawn.c (modified) (5 diffs)

trunk/src/comdlg32/colordlg.c

@@ +1 @@
+/* $Id: colordlg.c,v 1.4 2001-09-05 12:11:59 bird Exp $ */
 /*
  * COMMDLG - Color Dialog
@@ -74 +75 @@
  int nextuserdef;     /* next free place in user defined color array */
  HDC hdcMem;        /* color graph used for BitBlt() */
- HBITMAP hbmMem;    /* color graph bitmap */    
+ HBITMAP hbmMem;    /* color graph bitmap */
  RECT fullsize;     /* original dialog window size */
  UINT msetrgb;        /* # of SETRGBSTRING message (today not used)  */
@@ -155 +156 @@
   /* lum */
   case 'L': mmsum *= 120;              /* 0...61200=(255+255)*120 */
-           result = mmsum / 255;        /* 0...240 */
-           break;
+       result = mmsum / 255;        /* 0...240 */
+       break;
   /* saturation */
   case 'S': if (!mmsum)
-            result = 0;
-           else
-            if (!mini || maxi == 255)
-             result = 240;
-           else
-           {
-            result = mmdif * 240;       /* 0...61200=255*240 */
-            result /= (mmsum > 255 ? mmsum = 510 - mmsum : mmsum); /* 0..255 */
-           }
-           break;
+        result = 0;
+       else
+        if (!mini || maxi == 255)
+         result = 240;
+       else
+       {
+        result = mmdif * 240;       /* 0...61200=255*240 */
+        result /= (mmsum > 255 ? mmsum = 510 - mmsum : mmsum); /* 0..255 */
+       }
+       break;
   /* hue */
   case 'H': if (!mmdif)
-            result = 160;
-           else
-           {
-            if (maxi == r)
-            {
-             iresult = 40 * (g - b);       /* -10200 ... 10200 */
-             iresult /= (int) mmdif;    /* -40 .. 40 */
-             if (iresult < 0)
-              iresult += 240;          /* 0..40 and 200..240 */
-            }
-            else
-             if (maxi == g)
-             {
-              iresult = 40 * (b - r);
-              iresult /= (int) mmdif;
-              iresult += 80;           /* 40 .. 120 */
-             }
-             else
-              if (maxi == b)
-              {
-               iresult = 40 * (r - g);
-               iresult /= (int) mmdif;
-               iresult += 160;         /* 120 .. 200 */
-              }
-            result = iresult;
-           }
-           break;
+        result = 160;
+       else
+       {
+        if (maxi == r)
+        {
+         iresult = 40 * (g - b);       /* -10200 ... 10200 */
+         iresult /= (int) mmdif;    /* -40 .. 40 */
+         if (iresult < 0)
+          iresult += 240;          /* 0..40 and 200..240 */
+        }
+        else
+         if (maxi == g)
+         {
+          iresult = 40 * (b - r);
+          iresult /= (int) mmdif;
+          iresult += 80;           /* 40 .. 120 */
+         }
+         else
+          if (maxi == b)
+          {
+           iresult = 40 * (r - g);
+           iresult /= (int) mmdif;
+           iresult += 160;         /* 120 .. 200 */
+          }
+        result = iresult;
+       }
+       break;
  }
  return result;    /* is this integer arithmetic precise enough ? */
@@ -249 +250 @@
  */
 static int CC_MouseCheckPredefColorArray( LCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
-            LPARAM lParam )
+        LPARAM lParam )
 {
  HWND hwnd;
@@ -283 +284 @@
  */
 static int CC_MouseCheckUserColorArray( LCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
-            LPARAM lParam )
+        LPARAM lParam )
 {
  HWND hwnd;
@@ -317 +318 @@
 
 /*  240  ^......        ^^ 240
-         |     .        ||
+     |     .        ||
     SAT  |     .        || LUM
-         |     .        ||
-         +-----> 239   ----
-           HUE
+     |     .        ||
+     +-----> 239   ----
+       HUE
 */
 /***********************************************************************
@@ -464 +465 @@
  RECT rect;
  HWND hwnd = GetDlgItem(hDlg, 0x2be);
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA( hDlg, DWL_USER); 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA( hDlg, DWL_USER);
 
  if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6)))   /* if full size */
@@ -476 +477 @@
    ScreenToClient(hDlg, points);    /*  |<  |  */
    oben = points[0].y;                 /*  | \ |  */
-                                     /*  |  \|  */
+                     /*  |  \|  */
    temp = (long)height * (long)y;
    points[0].y = oben + height - temp / (long)MAXVERT;
@@ -502 +503 @@
  int w = GetDialogBaseUnits();
  HWND hwnd = GetDlgItem(hDlg, 0x2c6);
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA( hDlg, DWL_USER ); 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA( hDlg, DWL_USER );
  RECT rect;
  POINT point, p;
@@ -524 +525 @@
    lpp->oldcross.right  = point.x + w + 1;
    lpp->oldcross.top    = point.y - w - 1;
-   lpp->oldcross.bottom = point.y + w + 1; 
-
-   MoveToEx(hDC, point.x - w, point.y, &p); 
+   lpp->oldcross.bottom = point.y + w + 1;
+
+   MoveToEx(hDC, point.x - w, point.y, &p);
    LineTo(hDC, point.x + w, point.y);
-   MoveToEx(hDC, point.x, point.y - w, &p); 
+   MoveToEx(hDC, point.x, point.y - w, &p);
    LineTo(hDC, point.x, point.y + w);
    DeleteObject( SelectObject(hDC, hPen)) ;
@@ -543 +544 @@
  *                    CC_PrepareColorGraph                    [internal]
  */
-static void CC_PrepareColorGraph( HWND hDlg )    
+static void CC_PrepareColorGraph( HWND hDlg )
 {
  int sdif, hdif, xdif, ydif, r, g, b, hue, sat;
  HWND hwnd = GetDlgItem(hDlg, 0x2c6);
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);  
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
  HBRUSH hbrush;
  HDC hdc ;
@@ -590 +591 @@
 {
  HWND hwnd = GetDlgItem( hDlg, 0x2c6 );
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
  HDC  hDC;
  RECT rect;
@@ -650 +651 @@
 {
  char buffer[10];
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
  int r = GetRValue(cr);
  int g = GetGValue(cr);
@@ -695 +696 @@
 {
  int i;
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
- 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
+
  EnableWindow( GetDlgItem(hDlg, 0x2cf), FALSE);
  CC_PrepareColorGraph(hDlg);
@@ -743 +744 @@
  for ( j = 0; j < rows; j++ )
  {
-  for ( i = 0; i < cols; i++ ) 
+  for ( i = 0; i < cols; i++ )
   {
    hBrush = CreateSolidBrush(predefcolors[j][i]);
@@ -764 +765 @@
 /***********************************************************************
  *                             CC_PaintUserColorArray         [internal]
- *               Paint the 16 user-selected colors 
+ *               Paint the 16 user-selected colors
  */
 static void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr )
@@ -782 +783 @@
 
  hdc = GetDC(hwnd);
- if (hdc) 
+ if (hdc)
  {
   FillRect(hdc, &rect, GetClassLongA(hwnd, GCL_HBRBACKGROUND) );
@@ -791 +792 @@
     hBrush = CreateSolidBrush(lpcr[i+j*cols]);
     if (hBrush)
-    { 
+    {
      hBrush = SelectObject(hdc, hBrush) ;
      Rectangle(hdc, rect.left, rect.top,
@@ -826 +827 @@
  *                              CC_WMInitDialog                  [internal]
  */
-static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 ) 
+static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 )
 {
    int i, res;
@@ -833 +834 @@
    RECT rect;
    POINT point;
-   LCCPRIV lpp; 
-   
+   LCCPRIV lpp;
+
    TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
    lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) );
@@ -851 +852 @@
        }
        ch32->lStructSize = sizeof(CHOOSECOLORW);
-       ch32->hwndOwner = ch16->hwndOwner; 
+       ch32->hwndOwner = ch16->hwndOwner;
        ch32->hInstance = ch16->hInstance;
        ch32->lpCustColors = PTR_SEG_TO_LIN(ch16->lpCustColors);
@@ -866 +867 @@
       return FALSE;
    }
-   SetWindowLongA(hDlg, DWL_USER, (LONG)lpp); 
+   SetWindowLongA(hDlg, DWL_USER, (LONG)lpp);
 
    if (!(lpp->lpcc->Flags & CC_SHOWHELP))
@@ -876 +877 @@
    if (lpp->lpcc->Flags & CC_RGBINIT)
    {
-     for (i = 0; i < 6; i++) 
+     for (i = 0; i < 6; i++)
        for (j = 0; j < 8; j++)
         if (predefcolors[i][j] == lpp->lpcc->rgbResult)
@@ -930 +931 @@
           res = CallWindowProcA( (WNDPROC)lpp->lpcc->lpfnHook, hDlg, WM_INITDIALOG, wParam, lParam);
    }
-   
+
    /* Set the initial values of the color chooser dialog */
    r = GetRValue(lpp->lpcc->rgbResult);
@@ -959 +960 @@
  *                              CC_WMCommand                  [internal]
  */
-static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) 
+static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl )
 {
     int  r, g, b, i, xx;
@@ -965 +966 @@
     HDC hdc;
     COLORREF *cr;
-    LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+    LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
     TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam);
     switch (wParam)
     {
           case 0x2c2:  /* edit notify RGB */
-          case 0x2c3:
-          case 0x2c4:
-               if (notifyCode == EN_UPDATE && !lpp->updating)
-                         {
-                           i = CC_CheckDigitsInEdit(hwndCtl, 255);
-                           r = GetRValue(lpp->lpcc->rgbResult);
-                           g = GetGValue(lpp->lpcc->rgbResult);
-                           b= GetBValue(lpp->lpcc->rgbResult);
-                           xx = 0;
-                           switch (wParam)
-                           {
-                            case 0x2c2: if ((xx = (i != r))) r = i; break;
-                            case 0x2c3: if ((xx = (i != g))) g = i; break;
-                            case 0x2c4: if ((xx = (i != b))) b = i; break;
-                           }
-                           if (xx) /* something has changed */
-                           {
-                            lpp->lpcc->rgbResult = RGB(r, g, b);
-                            CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
-                            lpp->h = CC_RGBtoHSL('H', r, g, b);
-                            lpp->s = CC_RGBtoHSL('S', r, g, b);
-                            lpp->l = CC_RGBtoHSL('L', r, g, b);
-                            CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
-                            CC_PaintCross(hDlg, lpp->h, lpp->s);
-                            CC_PaintTriangle(hDlg, lpp->l);
-                           }
-                         }
-                 break;
-                 
-          case 0x2bf:  /* edit notify HSL */
-          case 0x2c0:
-          case 0x2c1:
-               if (notifyCode == EN_UPDATE && !lpp->updating)
-                         {
-                           i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240);
-                           xx = 0;
-                           switch (wParam)
-                           {
-                            case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break;
-                            case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break;
-                            case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break;
-                           }
-                           if (xx) /* something has changed */
-                           {
-                            r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l);
-                            g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l);
-                            b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l);
-                            lpp->lpcc->rgbResult = RGB(r, g, b);
-                            CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
-                            CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
-                            CC_PaintCross(hDlg, lpp->h, lpp->s);
-                            CC_PaintTriangle(hDlg, lpp->l);
-                           }
-                         }
-               break;
-               
+      case 0x2c3:
+      case 0x2c4:
+           if (notifyCode == EN_UPDATE && !lpp->updating)
+             {
+               i = CC_CheckDigitsInEdit(hwndCtl, 255);
+               r = GetRValue(lpp->lpcc->rgbResult);
+               g = GetGValue(lpp->lpcc->rgbResult);
+               b= GetBValue(lpp->lpcc->rgbResult);
+               xx = 0;
+               switch (wParam)
+               {
+                case 0x2c2: if ((xx = (i != r))) r = i; break;
+                case 0x2c3: if ((xx = (i != g))) g = i; break;
+                case 0x2c4: if ((xx = (i != b))) b = i; break;
+               }
+               if (xx) /* something has changed */
+               {
+                lpp->lpcc->rgbResult = RGB(r, g, b);
+                CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
+                lpp->h = CC_RGBtoHSL('H', r, g, b);
+                lpp->s = CC_RGBtoHSL('S', r, g, b);
+                lpp->l = CC_RGBtoHSL('L', r, g, b);
+                CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
+                CC_PaintCross(hDlg, lpp->h, lpp->s);
+                CC_PaintTriangle(hDlg, lpp->l);
+               }
+             }
+         break;
+
+      case 0x2bf:  /* edit notify HSL */
+      case 0x2c0:
+      case 0x2c1:
+           if (notifyCode == EN_UPDATE && !lpp->updating)
+             {
+               i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240);
+               xx = 0;
+               switch (wParam)
+               {
+                case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break;
+                case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break;
+                case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break;
+               }
+               if (xx) /* something has changed */
+               {
+                r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l);
+                g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l);
+                b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l);
+                lpp->lpcc->rgbResult = RGB(r, g, b);
+                CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
+                CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
+                CC_PaintCross(hDlg, lpp->h, lpp->s);
+                CC_PaintTriangle(hDlg, lpp->l);
+               }
+             }
+           break;
+
           case 0x2cf:
                CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, &lpp->fullsize);
-               SetFocus( GetDlgItem(hDlg, 0x2bf));
-               break;
+           SetFocus( GetDlgItem(hDlg, 0x2bf));
+           break;
 
           case 0x2c8:    /* add colors ... column by column */
@@ -1035 +1036 @@
                cr[(lpp->nextuserdef % 2) * 8 + lpp->nextuserdef / 2] = lpp->lpcc->rgbResult;
                if (++lpp->nextuserdef == 16)
-                   lpp->nextuserdef = 0;
-               CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors);
-               break;
+           lpp->nextuserdef = 0;
+           CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors);
+           break;
 
           case 0x2c9:              /* resulting color */
-               hdc = GetDC(hDlg);
-               lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult);
-               ReleaseDC(hDlg, hdc);
-               CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
-               CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
-               r = GetRValue(lpp->lpcc->rgbResult);
-               g = GetGValue(lpp->lpcc->rgbResult);
-               b = GetBValue(lpp->lpcc->rgbResult);
-               lpp->h = CC_RGBtoHSL('H', r, g, b);
-               lpp->s = CC_RGBtoHSL('S', r, g, b);
-               lpp->l = CC_RGBtoHSL('L', r, g, b);
-               CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
-               CC_PaintCross(hDlg, lpp->h, lpp->s);
-               CC_PaintTriangle(hDlg, lpp->l);
-               break;
-
-          case 0x40e:           /* Help! */ /* The Beatles, 1965  ;-) */
-               i = RegisterWindowMessageA(HELPMSGSTRINGA);
+           hdc = GetDC(hDlg);
+           lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult);
+           ReleaseDC(hDlg, hdc);
+           CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
+           CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
+           r = GetRValue(lpp->lpcc->rgbResult);
+           g = GetGValue(lpp->lpcc->rgbResult);
+           b = GetBValue(lpp->lpcc->rgbResult);
+           lpp->h = CC_RGBtoHSL('H', r, g, b);
+           lpp->s = CC_RGBtoHSL('S', r, g, b);
+           lpp->l = CC_RGBtoHSL('L', r, g, b);
+           CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
+           CC_PaintCross(hDlg, lpp->h, lpp->s);
+           CC_PaintTriangle(hDlg, lpp->l);
+           break;
+
+      case 0x40e:           /* Help! */ /* The Beatles, 1965  ;-) */
+           i = RegisterWindowMessageA(HELPMSGSTRINGA);
 #ifndef __WIN32OS2__
                if (lpp->lpcc16)
                {
                    if (lpp->lpcc->hwndOwner)
-                       SendMessage16(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16);
+               SendMessage16(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16);
                    if ( CC_HookCallChk(lpp->lpcc))
-                       CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook, hDlg,
-                          WM_COMMAND, psh15, (LPARAM)lpp->lpcc16);
+               CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook, hDlg,
+                  WM_COMMAND, psh15, (LPARAM)lpp->lpcc16);
                }
                else
@@ -1071 +1072 @@
 #endif //!__WIN32OS2__
                    if (lpp->lpcc->hwndOwner)
-                       SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc);
+               SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc);
                    if ( CC_HookCallChk(lpp->lpcc))
-                       CallWindowProcA( (WNDPROC) lpp->lpcc->lpfnHook, hDlg,
-                          WM_COMMAND, psh15, (LPARAM)lpp->lpcc);
+               CallWindowProcA( (WNDPROC) lpp->lpcc->lpfnHook, hDlg,
+                  WM_COMMAND, psh15, (LPARAM)lpp->lpcc);
 #ifndef __WIN32OS2__
                }
 #endif //!__WIN32OS2__
-               break;
+           break;
 
           case IDOK :
-                cokmsg = RegisterWindowMessageA(COLOROKSTRINGA);
+        cokmsg = RegisterWindowMessageA(COLOROKSTRINGA);
 #ifndef __WIN32OS2__
                 if (lpp->lpcc16)
                 {
-                    if (lpp->lpcc->hwndOwner)
-                        if (SendMessage16(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16))
-                           break;    /* do NOT close */
+            if (lpp->lpcc->hwndOwner)
+            if (SendMessage16(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16))
+               break;    /* do NOT close */
                 }
                 else
                 {
 #endif //!__WIN32OS2__
-                    if (lpp->lpcc->hwndOwner)
-                        if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc))
-                           break;    /* do NOT close */
+            if (lpp->lpcc->hwndOwner)
+            if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc))
+               break;    /* do NOT close */
 #ifndef __WIN32OS2__
                 }
@@ -1104 +1105 @@
                 }
 #endif
-                EndDialog(hDlg, 1) ;
-                return TRUE ;
-        
-          case IDCANCEL :
-                EndDialog(hDlg, 0) ;
-                return TRUE ;
+        EndDialog(hDlg, 1) ;
+        return TRUE ;
+
+      case IDCANCEL :
+        EndDialog(hDlg, 0) ;
+        return TRUE ;
 
        }
@@ -1118 +1119 @@
  *                              CC_WMPaint                    [internal]
  */
-static LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) 
+static LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam )
 {
     HDC hdc;
     PAINTSTRUCT ps;
-    LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+    LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
 
     hdc = BeginPaint(hDlg, &ps);
@@ -1151 +1152 @@
        CC_PaintCross(hDlg, lpp->h, lpp->s);
        return 1;
-   } 
+   }
    return 0;
 }
@@ -1159 +1160 @@
  *                              CC_WMMouseMove              [internal]
  */
-static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) 
-{
-   LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam )
+{
+   LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
    int r, g, b;
 
@@ -1167 +1168 @@
    {
       int *ptrh = NULL, *ptrs = &lpp->l;
-      if (lpp->capturedGraph == 0x2c6) 
+      if (lpp->capturedGraph == 0x2c6)
       {
           ptrh = &lpp->h;
@@ -1196 +1197 @@
  *                              CC_WMLButtonDown              [internal]
  */
-static LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ) 
-{
-   LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+static LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam )
+{
+   LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
    int r, g, b, i;
    i = 0;
@@ -1208 +1209 @@
          i = 1;
       else
-         if (CC_MouseCheckColorGraph(hDlg, 0x2c6, &lpp->h, &lpp->s, lParam))
+     if (CC_MouseCheckColorGraph(hDlg, 0x2c6, &lpp->h, &lpp->s, lParam))
          {
-            i = 2;
+        i = 2;
             lpp->capturedGraph = 0x2c6;
          }
-         else
-            if (CC_MouseCheckColorGraph(hDlg, 0x2be, NULL, &lpp->l, lParam))
+     else
+        if (CC_MouseCheckColorGraph(hDlg, 0x2be, NULL, &lpp->l, lParam))
             {
-               i = 2;
+           i = 2;
                lpp->capturedGraph = 0x2be;
             }
@@ -1276 +1277 @@
 
  switch (message)
-        {
-          case WM_INITDIALOG:
-                        return CC_WMInitDialog(hDlg, wParam, lParam, FALSE);
-          case WM_NCDESTROY:
-                        DeleteDC(lpp->hdcMem); 
-                        DeleteObject(lpp->hbmMem); 
+    {
+      case WM_INITDIALOG:
+                    return CC_WMInitDialog(hDlg, wParam, lParam, FALSE);
+      case WM_NCDESTROY:
+                    DeleteDC(lpp->hdcMem);
+                    DeleteObject(lpp->hbmMem);
                         HeapFree(GetProcessHeap(), 0, lpp);
-                        SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */
-                        break;
-          case WM_COMMAND:
-                        if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam))
-                           return TRUE;
-                        break;     
-          case WM_PAINT:
-                        if ( CC_WMPaint(hDlg, wParam, lParam))
-                           return TRUE;
-                        break;
-          case WM_LBUTTONDBLCLK:
-                        if (CC_MouseCheckResultWindow(hDlg, lParam))
-                          return TRUE;
-                        break;
-          case WM_MOUSEMOVE:
-                        if (CC_WMMouseMove(hDlg, lParam))
-                          return TRUE;
-                        break;
-          case WM_LBUTTONUP:  /* FIXME: ClipCursor off (if in color graph)*/
+                    SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */
+                    break;
+      case WM_COMMAND:
+                    if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam))
+                       return TRUE;
+                    break;
+      case WM_PAINT:
+                    if ( CC_WMPaint(hDlg, wParam, lParam))
+                       return TRUE;
+                    break;
+      case WM_LBUTTONDBLCLK:
+                    if (CC_MouseCheckResultWindow(hDlg, lParam))
+              return TRUE;
+            break;
+      case WM_MOUSEMOVE:
+                    if (CC_WMMouseMove(hDlg, lParam))
+              return TRUE;
+            break;
+      case WM_LBUTTONUP:  /* FIXME: ClipCursor off (if in color graph)*/
                         if (CC_WMLButtonUp(hDlg, wParam, lParam))
                            return TRUE;
-                        break;
-          case WM_LBUTTONDOWN:/* FIXME: ClipCursor on  (if in color graph)*/
-                        if (CC_WMLButtonDown(hDlg, wParam, lParam))
-                           return TRUE;
-                        break;     
-        }
+            break;
+      case WM_LBUTTONDOWN:/* FIXME: ClipCursor on  (if in color graph)*/
+                    if (CC_WMLButtonDown(hDlg, wParam, lParam))
+                       return TRUE;
+                    break;
+    }
      return FALSE ;
 }
@@ -1321 +1322 @@
 {
  int res;
- LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); 
+ LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
  if (message != WM_INITDIALOG)
  {
@@ -1339 +1340 @@
 
  switch (message)
-        {
-          case WM_INITDIALOG:
-                        return CC_WMInitDialog(hDlg, wParam, lParam, TRUE);
-          case WM_NCDESTROY:
-                        DeleteDC(lpp->hdcMem); 
-                        DeleteObject(lpp->hbmMem); 
+    {
+      case WM_INITDIALOG:
+                    return CC_WMInitDialog(hDlg, wParam, lParam, TRUE);
+      case WM_NCDESTROY:
+                    DeleteDC(lpp->hdcMem);
+                    DeleteObject(lpp->hbmMem);
                         HeapFree(GetProcessHeap(), 0, lpp->lpcc);
                         HeapFree(GetProcessHeap(), 0, lpp);
-                        SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */
-                        break;
-          case WM_COMMAND:
-                        if (CC_WMCommand(hDlg, wParam, lParam, HIWORD(lParam), (HWND)LOWORD(lParam)))
-                           return TRUE;
-                        break;     
-          case WM_PAINT:
-                        if (CC_WMPaint(hDlg, wParam, lParam))
-                           return TRUE;
-                        break;
-          case WM_LBUTTONDBLCLK:
-                        if (CC_MouseCheckResultWindow(hDlg,lParam))
-                          return TRUE;
-                        break;
-          case WM_MOUSEMOVE:
-                        if (CC_WMMouseMove(hDlg, lParam))
-                          return TRUE;
-                        break;
-          case WM_LBUTTONUP:  /* FIXME: ClipCursor off (if in color graph)*/
+                    SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */
+                    break;
+      case WM_COMMAND:
+                    if (CC_WMCommand(hDlg, wParam, lParam, HIWORD(lParam), (HWND)LOWORD(lParam)))
+                       return TRUE;
+                    break;
+      case WM_PAINT:
+                    if (CC_WMPaint(hDlg, wParam, lParam))
+                       return TRUE;
+                    break;
+      case WM_LBUTTONDBLCLK:
+                    if (CC_MouseCheckResultWindow(hDlg,lParam))
+              return TRUE;
+            break;
+      case WM_MOUSEMOVE:
+                    if (CC_WMMouseMove(hDlg, lParam))
+              return TRUE;
+            break;
+      case WM_LBUTTONUP:  /* FIXME: ClipCursor off (if in color graph)*/
                         if (CC_WMLButtonUp(hDlg, wParam, lParam))
                            return TRUE;
-                        break;
-          case WM_LBUTTONDOWN:/* FIXME: ClipCursor on  (if in color graph)*/
-                        if (CC_WMLButtonDown(hDlg, wParam, lParam))
-                           return TRUE;
-                        break;     
-        }
+            break;
+      case WM_LBUTTONDOWN:/* FIXME: ClipCursor on  (if in color graph)*/
+                    if (CC_WMLButtonDown(hDlg, wParam, lParam))
+                       return TRUE;
+                    break;
+    }
      return FALSE ;
 }
@@ -1390 +1391 @@
     LPCVOID template;
     FARPROC16 ptr;
- 
+
     TRACE("ChooseColor\n");
-    if (!lpChCol) return FALSE;    
+    if (!lpChCol) return FALSE;
 
     if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE)
@@ -1415 +1416 @@
     else
     {
-        HANDLE hResInfo, hDlgTmpl32;
+    HANDLE hResInfo, hDlgTmpl32;
         LPCVOID template32;
         DWORD size;
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
-        }
-        if (!(hDlgTmpl32 = LoadResource(COMMDLG_hInstance32, hResInfo)) ||
-            !(template32 = LockResource(hDlgTmpl32)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA)))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
+    }
+    if (!(hDlgTmpl32 = LoadResource(COMMDLG_hInstance32, hResInfo)) ||
+        !(template32 = LockResource(hDlgTmpl32)))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
         size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
         hGlobal16 = GlobalAlloc16(0, size);
@@ -1438 +1439 @@
         }
         template = GlobalLock16(hGlobal16);
-        if (!template) 
+        if (!template)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE);
@@ -1475 +1476 @@
 
     TRACE("ChooseColor\n");
-    if (!lpChCol) return FALSE;    
+    if (!lpChCol) return FALSE;
 
     if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE)
@@ -1504 +1505 @@
     else
     {
-        HANDLE hResInfo, hDlgTmpl;
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
-        }
-        if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
-            !(template = LockResource(hDlgTmpl)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    HANDLE hResInfo, hDlgTmpl;
+    if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA)))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
+    }
+    if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
+        !(template = LockResource(hDlgTmpl)))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
     }
 
@@ -1541 +1542 @@
   if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
       if (HIWORD(lpChCol->lpTemplateName))
-          lpcc->lpTemplateName = HEAP_strdupAtoW(GetProcessHeap(), 0, lpChCol->lpTemplateName);
+      lpcc->lpTemplateName = HEAP_strdupAtoW(GetProcessHeap(), 0, lpChCol->lpTemplateName);
       else
-          lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName;
+      lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName;
   }
 

trunk/src/comdlg32/filedlg.c

@@ +1 @@
+/* $Id: filedlg.c,v 1.6 2001-09-05 12:12:00 bird Exp $ */
 /*
  * COMMDLG - File Dialogs
@@ -28 +29 @@
 #define GlobalLock16 GlobalLock
 #define GlobalUnlock16 GlobalUnlock
-#define GlobalAlloc16   GlobalAlloc
-#define FreeResource16  FreeResource
+#define GlobalAlloc16   GlobalAlloc
+#define FreeResource16  FreeResource
 #define LoadResource16  LoadResourceA
 #define FindResource16  FindResourceA
-#define MapSL(a)        a
+#define MapSL(a)    a
 #define CallWindowProc16 CallWindowProcA
 
@@ -42 +43 @@
 
 #define BUFFILE 512
-#define BUFFILEALLOC 512 * sizeof(WCHAR)   
-
-struct FSPRIVATE 
+#define BUFFILEALLOC 512 * sizeof(WCHAR)
+
+struct FSPRIVATE
 {
     HWND hwnd; /* file dialog window handle */
@@ -75 +76 @@
 #define LFS32A 2
 #define LFS32W 3
- 
+
 static const WCHAR FILE_star[] = {'*','.','*', 0};
 static const WCHAR FILE_bslash[] = {'\\', 0};
@@ -111 +112 @@
 
 LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
-                                 LPARAM lParam);
+                 LPARAM lParam);
 LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
-                                 LPARAM lParam);
+                 LPARAM lParam);
 
 static LRESULT WINAPI FileOpenDlgProc(HWND hDlg, UINT msg,
@@ -119 +120 @@
 
 /***********************************************************************
- *                              FileDlg_Init                    [internal]
+ *              FileDlg_Init            [internal]
  */
 static BOOL FileDlg_Init(void)
@@ -125 +126 @@
     static BOOL initialized = 0;
     CURSORICONINFO *fldrInfo;
-    
+
     if (!initialized) {
 #ifdef __WIN32OS2__
-        if (!hFolder) hFolder = LoadImageA(0, MAKEINTRESOURCEA(OIC_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED);
-        if (!hFolder2) hFolder2 = LoadImageA(0, MAKEINTRESOURCEA(OIC_FOLDER2), IMAGE_ICON, 16, 16, LR_SHARED);
-        if (!hFloppy) hFloppy = LoadImageA(0, MAKEINTRESOURCEA(OIC_FLOPPY), IMAGE_ICON, 16, 16, LR_SHARED);
-        if (!hHDisk) hHDisk = LoadImageA(0, MAKEINTRESOURCEA(OIC_HDISK), IMAGE_ICON, 16, 16, LR_SHARED);
-        if (!hCDRom) hCDRom = LoadImageA(0, MAKEINTRESOURCEA(OIC_CDROM), IMAGE_ICON, 16, 16, LR_SHARED);
-        if (!hNet) hNet = LoadImageA(0, MAKEINTRESOURCEA(OIC_NETWORK), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hFolder) hFolder = LoadImageA(0, MAKEINTRESOURCEA(OIC_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hFolder2) hFolder2 = LoadImageA(0, MAKEINTRESOURCEA(OIC_FOLDER2), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hFloppy) hFloppy = LoadImageA(0, MAKEINTRESOURCEA(OIC_FLOPPY), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hHDisk) hHDisk = LoadImageA(0, MAKEINTRESOURCEA(OIC_HDISK), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hCDRom) hCDRom = LoadImageA(0, MAKEINTRESOURCEA(OIC_CDROM), IMAGE_ICON, 16, 16, LR_SHARED);
+    if (!hNet) hNet = LoadImageA(0, MAKEINTRESOURCEA(OIC_NETWORK), IMAGE_ICON, 16, 16, LR_SHARED);
 #else
         HINSTANCE inst = GetModuleHandleA( "comdlg32.dll" );
@@ -148 +149 @@
         hNet     = LoadImageA( inst, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
 #endif
-        if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || 
-            hHDisk == 0 || hCDRom == 0 || hNet == 0)
-        {
-            ERR("Error loading icons !\n");
-            return FALSE;
-        }
+    if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
+        hHDisk == 0 || hCDRom == 0 || hNet == 0)
+    {
+        ERR("Error loading icons !\n");
+        return FALSE;
+    }
 #ifdef __WIN32OS2__
-        fldrHeight = 16;
-        fldrWidth = 16;
+    fldrHeight = 16;
+    fldrWidth = 16;
 #else
-        fldrInfo = (CURSORICONINFO *) GlobalLock16( hFolder2 );
-        if (!fldrInfo)
-        {       
-            ERR("Error measuring icons !\n");
-            return FALSE;
-        }
-        fldrHeight = fldrInfo -> nHeight;
-        fldrWidth = fldrInfo -> nWidth;
-        GlobalUnlock16( hFolder2 );
-#endif
-        initialized = TRUE;
+    fldrInfo = (CURSORICONINFO *) GlobalLock16( hFolder2 );
+    if (!fldrInfo)
+    {
+        ERR("Error measuring icons !\n");
+        return FALSE;
+    }
+    fldrHeight = fldrInfo -> nHeight;
+    fldrWidth = fldrInfo -> nWidth;
+    GlobalUnlock16( hFolder2 );
+#endif
+    initialized = TRUE;
     }
     return TRUE;
@@ -188 +189 @@
     if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE)
     {
-        if (!(lfs->template = LockResource( ofnW->hInstance )))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    if (!(lfs->template = LockResource( ofnW->hInstance )))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
     }
     else if (ofnW->Flags & OFN_ENABLETEMPLATE)
     {
-        HANDLE hResInfo;
+    HANDLE hResInfo;
         if (lfs->ofnA)
-            hResInfo = FindResourceA(lfs->ofnA->hInstance,
-                                 lfs->ofnA->lpTemplateName,
+        hResInfo = FindResourceA(lfs->ofnA->hInstance,
+                 lfs->ofnA->lpTemplateName,
                                  RT_DIALOGA);
         else
-            hResInfo = FindResourceW(ofnW->hInstance,
-                                 ofnW->lpTemplateName,
+        hResInfo = FindResourceW(ofnW->hInstance,
+                 ofnW->lpTemplateName,
                                  RT_DIALOGW);
         if (!hResInfo)
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
-        }
-        if (!(hDlgTmpl = LoadResource(ofnW->hInstance,
-                                hResInfo)) ||
-                    !(lfs->template = LockResource(hDlgTmpl)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
+    }
+    if (!(hDlgTmpl = LoadResource(ofnW->hInstance,
+                hResInfo)) ||
+            !(lfs->template = LockResource(hDlgTmpl)))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
     } else { /* get it from internal Wine resource */
-        HANDLE hResInfo;
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, 
+    HANDLE hResInfo;
+    if (!(hResInfo = FindResourceA(COMMDLG_hInstance32,
              lfs->open? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
         }
         if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
@@ -253 +254 @@
     else if (ofn16->Flags & OFN_ENABLETEMPLATE)
     {
-        HANDLE16 hResInfo;
-        if (!(hResInfo = FindResource16(ofn16->hInstance,
-                                        MapSL(ofn16->lpTemplateName),
+    HANDLE16 hResInfo;
+    if (!(hResInfo = FindResource16(ofn16->hInstance,
+                    MapSL(ofn16->lpTemplateName),
                                         RT_DIALOGA)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
-        }
-        if (!(lfs->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo )))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
+    }
+    if (!(lfs->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo )))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
         lfs->hResource16 = lfs->hDlgTmpl16;
     }
     else
     { /* get resource from (32 bits) own Wine resource; convert it to 16 */
-        HANDLE hResInfo, hDlgTmpl32;
+    HANDLE hResInfo, hDlgTmpl32;
         LPCVOID template32;
         DWORD size;
 
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, 
+    if (!(hResInfo = FindResourceA(COMMDLG_hInstance32,
                lfs->open ? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA)))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-            return FALSE;
-        }
-        if (!(hDlgTmpl32 = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
-            !(template32 = LockResource( hDlgTmpl32 )))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+        return FALSE;
+    }
+    if (!(hDlgTmpl32 = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
+        !(template32 = LockResource( hDlgTmpl32 )))
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
         size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
         hGlobal16 = GlobalAlloc16(0, size);
@@ -321 +322 @@
     cp = strrchrW(temp, '\\');
     if (cp != NULL) {
-        strcpyW(temp, cp+1);
+    strcpyW(temp, cp+1);
     }
     cp = strrchrW(temp, ':');
     if (cp != NULL) {
-        strcpyW(temp, cp+1);
+    strcpyW(temp, cp+1);
     }
     /* FIXME: shouldn't we do something with the result here? ;-) */
@@ -366 +367 @@
 
 /***********************************************************************
- *                              FILEDLG_ScanDir                 [internal]
+ *              FILEDLG_ScanDir                 [internal]
  */
 static BOOL FILEDLG_ScanDir(HWND hWnd, LPWSTR newPath)
 {
-    WCHAR               buffer[BUFFILE];
-    HWND                hdlg, hdlgDir;
+    WCHAR       buffer[BUFFILE];
+    HWND        hdlg, hdlgDir;
     LRESULT             lRet = TRUE;
     HCURSOR             hCursorWait, oldCursor;
@@ -387 +388 @@
     /* list of files */
     if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) {
-        WCHAR*  scptr; /* ptr on semi-colon */
-        WCHAR*  filter = buffer;
-
-        TRACE("Using filter %s\n", debugstr_w(filter));
-        SendMessageW(hdlg, LB_RESETCONTENT, 0, 0);
-        while (filter) {
-            scptr = strchrW(filter, ';');
-            if (scptr)  *scptr = 0;
+        WCHAR*  scptr; /* ptr on semi-colon */
+    WCHAR*  filter = buffer;
+
+    TRACE("Using filter %s\n", debugstr_w(filter));
+    SendMessageW(hdlg, LB_RESETCONTENT, 0, 0);
+    while (filter) {
+        scptr = strchrW(filter, ';');
+        if (scptr)  *scptr = 0;
             while (*filter == ' ') filter++;
-            TRACE("Using file spec %s\n", debugstr_w(filter));
-            if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
-                return FALSE;
-            if (scptr) *scptr = ';';
-                filter = (scptr) ? (scptr + 1) : 0;
-         }
+        TRACE("Using file spec %s\n", debugstr_w(filter));
+        if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
+            return FALSE;
+        if (scptr) *scptr = ';';
+            filter = (scptr) ? (scptr + 1) : 0;
+     }
     }
 
@@ -416 +417 @@
 
 /***********************************************************************
- *                              FILEDLG_GetFileType             [internal]
+ *              FILEDLG_GetFileType     [internal]
  */
 
@@ -424 +425 @@
   i = 0;
   if (cfptr)
-    for ( ;(n = lstrlenW(cfptr)) != 0; i++) 
+    for ( ;(n = lstrlenW(cfptr)) != 0; i++)
       {
-        cfptr += n + 1;
-        if (i == index)
-          return cfptr;
-        cfptr += lstrlenW(cfptr) + 1;
+    cfptr += n + 1;
+    if (i == index)
+      return cfptr;
+    cfptr += lstrlenW(cfptr) + 1;
       }
   if (fptr)
-    for ( ;(n = lstrlenW(fptr)) != 0; i++) 
+    for ( ;(n = lstrlenW(fptr)) != 0; i++)
       {
-        fptr += n + 1;
-        if (i == index)
-          return fptr;
-        fptr += lstrlenW(fptr) + 1;
+    fptr += n + 1;
+    if (i == index)
+      return fptr;
+    fptr += lstrlenW(fptr) + 1;
     }
   return (LPWSTR) FILE_star; /* FIXME */
@@ -455 +456 @@
     {
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) return FALSE;
-        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, 
+    SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
                       (LPARAM)str);
 
-        if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
-        {
-            oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-            oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-        }
-        if (savedlg)
-            SetTextColor(lpdis->hDC,GetSysColor(COLOR_GRAYTEXT) );
-
-        ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + 1,
+    if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
+    {
+        oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+        oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+    }
+    if (savedlg)
+        SetTextColor(lpdis->hDC,GetSysColor(COLOR_GRAYTEXT) );
+
+    ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + 1,
                   lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
                   &(lpdis->rcItem), str, lstrlenW(str), NULL);
 
-        if (lpdis->itemState & ODS_SELECTED)
-            DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
-
-        if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
-        {
-            SetBkColor( lpdis->hDC, oldBk );
-            SetTextColor( lpdis->hDC, oldText );
-        }
+    if (lpdis->itemState & ODS_SELECTED)
+        DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
+
+    if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
+    {
+        SetBkColor( lpdis->hDC, oldBk );
+        SetTextColor( lpdis->hDC, oldText );
+    }
         HeapFree(GetProcessHeap(), 0, str);
-        return TRUE;
+    return TRUE;
     }
 
@@ -486 +487 @@
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
             return FALSE;
-        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, 
+    SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
                       (LPARAM)str);
 
-        if (lpdis->itemState & ODS_SELECTED)
-        {
-            oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-            oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-        }
-        ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
+    if (lpdis->itemState & ODS_SELECTED)
+    {
+        oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+        oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+    }
+    ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
                   lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
                   &(lpdis->rcItem), str, lstrlenW(str), NULL);
 
-        if (lpdis->itemState & ODS_SELECTED)
-            DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
-
-        if (lpdis->itemState & ODS_SELECTED)
-        {
-            SetBkColor( lpdis->hDC, oldBk );
-            SetTextColor( lpdis->hDC, oldText );
-        }
-        DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder);
+    if (lpdis->itemState & ODS_SELECTED)
+        DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
+
+    if (lpdis->itemState & ODS_SELECTED)
+    {
+        SetBkColor( lpdis->hDC, oldBk );
+        SetTextColor( lpdis->hDC, oldText );
+    }
+    DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder);
         HeapFree(GetProcessHeap(), 0, str);
-        return TRUE;
+    return TRUE;
     }
     if (lpdis->CtlType == ODT_COMBOBOX && lpdis->CtlID == cmb2)
@@ -515 +516 @@
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
             return FALSE;
-        SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID, 
+    SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID,
                       (LPARAM)str);
         root[0] += str[2] - 'a';
@@ -526 +527 @@
         default:           hIcon = hHDisk; break;
         }
-        if (lpdis->itemState & ODS_SELECTED)
-        {
-            oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-            oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-        }
-        ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
+    if (lpdis->itemState & ODS_SELECTED)
+    {
+        oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+        oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+    }
+    ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
                   lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
                   &(lpdis->rcItem), str, lstrlenW(str), NULL);
 
-        if (lpdis->itemState & ODS_SELECTED)
-        {
-            SetBkColor( lpdis->hDC, oldBk );
-            SetTextColor( lpdis->hDC, oldText );
-        }
-        DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon);
+    if (lpdis->itemState & ODS_SELECTED)
+    {
+        SetBkColor( lpdis->hDC, oldBk );
+        SetTextColor( lpdis->hDC, oldText );
+    }
+    DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon);
         HeapFree(GetProcessHeap(), 0, str);
-        return TRUE;
+    return TRUE;
     }
     return FALSE;
@@ -550 +551 @@
  *                              FILEDLG_WMMeasureItem           [internal]
  */
-static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmeasure;
-    
+
     lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
     lpmeasure->itemHeight = fldrHeight;
@@ -562 +563 @@
  */
 #ifdef __WIN32OS2__
-static LONG FILEDLG_WMMeasureItem16(HWND hWnd, WPARAM wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem16(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmeasure;
-    
+
     lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
     lpmeasure->itemHeight = fldrHeight;
@@ -571 +572 @@
 }
 #else
-static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT16 lpmeasure;
-    
+
     lpmeasure = MapSL(lParam);
     lpmeasure->itemHeight = fldrHeight;
@@ -608 +609 @@
       TRACE("lpstrCustomFilter = %p\n", pstr);
       while(*pstr)
-        {
-          old_pstr = pstr;
+    {
+      old_pstr = pstr;
           i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
                                    (LPARAM)(ofn->lpstrCustomFilter) + n );
           n += lstrlenW(pstr) + 1;
-          pstr += lstrlenW(pstr) + 1;
-          TRACE("add str='%s' "
-          "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
+      pstr += lstrlenW(pstr) + 1;
+      TRACE("add str='%s' "
+      "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
           SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
           n += lstrlenW(pstr) + 1;
-          pstr += lstrlenW(pstr) + 1;
-        }
+      pstr += lstrlenW(pstr) + 1;
+    }
     }
   /* read filter information */
   if (ofn->lpstrFilter) {
-        pstr = (LPWSTR) ofn->lpstrFilter;
-        n = 0;
-        while(*pstr) {
-          old_pstr = pstr;
-          i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
-                                       (LPARAM)(ofn->lpstrFilter + n) );
-          n += lstrlenW(pstr) + 1;
-          pstr += lstrlenW(pstr) + 1;
-          TRACE("add str='%s' "
-                  "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
-          SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
-          n += lstrlenW(pstr) + 1;
-          pstr += lstrlenW(pstr) + 1;
-        }
+    pstr = (LPWSTR) ofn->lpstrFilter;
+    n = 0;
+    while(*pstr) {
+      old_pstr = pstr;
+      i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
+                       (LPARAM)(ofn->lpstrFilter + n) );
+      n += lstrlenW(pstr) + 1;
+      pstr += lstrlenW(pstr) + 1;
+      TRACE("add str='%s' "
+          "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
+      SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
+      n += lstrlenW(pstr) + 1;
+      pstr += lstrlenW(pstr) + 1;
+    }
   }
   /* set default filter */
   if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL)
-        ofn->nFilterIndex = 1;
-  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);    
+    ofn->nFilterIndex = 1;
+  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
   lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
-             (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n", 
-                        ofn->nFilterIndex, debugstr_w(tmpstr));
+         (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
+  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n",
+            ofn->nFilterIndex, debugstr_w(tmpstr));
   SetDlgItemTextW( hWnd, edt1, tmpstr );
   /* get drive list */
@@ -651 +652 @@
   DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE);
   /* read initial directory */
-  if (ofn->lpstrInitialDir != NULL) 
+  if (ofn->lpstrInitialDir != NULL)
     {
       int len;
@@ -690 +691 @@
       {
           str[0] = 'a' + i;
-          if(drives & (1 << i)) n++;
+          if(drives & (1 << i)) n++;
 
           if (toupper(str[0]) == toupper(dir[0])) break;
@@ -720 +721 @@
 /***********************************************************************
  *                              FILEDLG_UpdateResult            [internal]
- *      update the displayed file name (with path) 
+ *      update the displayed file name (with path)
  */
 void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
@@ -747 +748 @@
     if (lfs->ofn16)
     { /* we have to convert to short (8.3) path */
-        char tmp[1024]; /* MAX_PATHNAME_LEN */
-        LPOPENFILENAME16 ofn16 = lfs->ofn16;
+    char tmp[1024]; /* MAX_PATHNAME_LEN */
+    LPOPENFILENAME16 ofn16 = lfs->ofn16;
         char *dest = MapSL(ofn16->lpstrFile);
         if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
                                   tmp, ofnW->nMaxFile, NULL, NULL ))
             tmp[ofnW->nMaxFile-1] = 0;
-        GetShortPathNameA(tmp, dest, ofn16->nMaxFile);
-
-        /* the same procedure as every year... */
+    GetShortPathNameA(tmp, dest, ofn16->nMaxFile);
+
+    /* the same procedure as every year... */
         ofn16->nFileOffset = strrchr(dest,'\\') - dest +1;
         ofn16->nFileExtension = 0;
@@ -779 +780 @@
 /***********************************************************************
  *                              FILEDLG_UpdateFileTitle         [internal]
- *      update the displayed file name (without path) 
+ *      update the displayed file name (without path)
  */
 void FILEDLG_UpdateFileTitle(LFSPRIVATE lfs)
@@ -785 +786 @@
   LONG lRet;
   LPOPENFILENAMEW ofnW = lfs->ofnW;
-  if (ofnW->lpstrFileTitle != NULL) 
+  if (ofnW->lpstrFileTitle != NULL)
   {
     lRet = SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
@@ -825 +826 @@
   pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC);
   SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet,
-                     (LPARAM)pstr);
+             (LPARAM)pstr);
   strcpyW( tmpstr, pstr );
   HeapFree(GetProcessHeap(), 0, pstr);
@@ -897 +898 @@
     pBeginFileName = strrchrW(path, '\\');
     if (pBeginFileName == NULL)
-        pBeginFileName = strrchrW(path, ':');
+    pBeginFileName = strrchrW(path, ':');
 
     if (strchrW(path,'*') != NULL || strchrW(path,'?') != NULL)
@@ -904 +905 @@
         if (pBeginFileName != NULL)
         {
-            lstrcpynW(tmpstr2, pBeginFileName + 1, BUFFILE);
-            *(pBeginFileName + 1) = 0;
-        }
-        else
-        {
-            strcpyW(tmpstr2, path);
-            *path = 0;
+        lstrcpynW(tmpstr2, pBeginFileName + 1, BUFFILE);
+        *(pBeginFileName + 1) = 0;
+    }
+    else
+    {
+        strcpyW(tmpstr2, path);
+        *path = 0;
         }
 
@@ -997 +998 @@
         lRet = (BOOL)FILEDLG_CallWindowProc(lfs, lfs->fileokstring,
                   0, lfs->lParam );
-        if (lRet)       
+        if (lRet)
         {
             *ofnW = ofnsav; /* restore old state */
@@ -1009 +1010 @@
             LPWSTR str = (LPWSTR)ofnW->lpstrFile;
             LPWSTR ptr = strrchrW(str, '\\');
-            str[lstrlenW(str) + 1] = '\0';
-            *ptr = 0;
+        str[lstrlenW(str) + 1] = '\0';
+        *ptr = 0;
         }
     }
@@ -1035 +1036 @@
                          (LPARAM)pstr);
     wsprintfW(diskname, FILE_specc, pstr[2]);
-    HeapFree(GetProcessHeap(), 0, pstr);    
+    HeapFree(GetProcessHeap(), 0, pstr);
 
     return FILEDLG_Validate( lfs, diskname, cmb2, lRet, TRUE );
@@ -1067 +1068 @@
  */
 static LRESULT FILEDLG_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
-       UINT control, LFSPRIVATE lfs ) 
+       UINT control, LFSPRIVATE lfs )
 {
     switch (control)
@@ -1090 +1091 @@
 
         case cmb1: /* file type drop list */
-        if (notification == CBN_SELCHANGE) 
+        if (notification == CBN_SELCHANGE)
             return FILEDLG_FileTypeChange( lfs );
         break;
@@ -1215 +1216 @@
     if (ofnA->lpstrTitle)
         str = ofnA->lpstrTitle;
-    else 
+    else
         /* Allocates default title (FIXME : get it from resource) */
         str = open ? defaultopen:defaultsave;
@@ -1272 +1273 @@
 /************************************************************************
  *                              FILEDLG_DestroyPrivate            [internal]
- *      destroys the private object 
+ *      destroys the private object
  */
 void FILEDLG_DestroyPrivate(LFSPRIVATE lfs)
@@ -1311 +1312 @@
 /************************************************************************
  *                              FILEDLG_AllocPrivate            [internal]
- *      allocate a private object to hold 32 bits Unicode 
+ *      allocate a private object to hold 32 bits Unicode
  *      structure that will be used throughtout the calls, while
  *      keeping available the original structures and a few variables
@@ -1369 +1370 @@
                 FILEDLG_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open);
         }
-        else 
+        else
             ret = NULL;
     }
@@ -1390 +1391 @@
  * Creates a win31 style dialog box for the user to select a file to open/save.
  */
-BOOL WINAPI GetFileName31A( 
+BOOL WINAPI GetFileName31A(
                            LPOPENFILENAMEA lpofn, /* addess of structure with data*/
                            UINT dlgType /* type dialogue : open/save */
@@ -1405 +1406 @@
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
              (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1420 +1421 @@
  * Creates a win31 style dialog box for the user to select a file to open/save
  */
-BOOL WINAPI GetFileName31W( 
+BOOL WINAPI GetFileName31W(
                            LPOPENFILENAMEW lpofn, /* addess of structure with data*/
                            UINT dlgType /* type dialogue : open/save */
@@ -1435 +1436 @@
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
              (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1453 +1454 @@
 LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
-{  
+{
     LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
     DRAWITEMSTRUCT dis;
- 
+
     TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
         {
             LRESULT lRet = (BOOL16)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-            if (lRet)   
+            if (lRet)
                 return lRet;         /* else continue message processing */
         }
@@ -1483 +1484 @@
          switch (HIWORD(lParam))
          {
-         case CTLCOLOR_BTN:
-             SetTextColor((HDC16)wParam, 0x00000000);
+     case CTLCOLOR_BTN:
+         SetTextColor((HDC16)wParam, 0x00000000);
              return hGRAYBrush;
-        case CTLCOLOR_STATIC:
+    case CTLCOLOR_STATIC:
              SetTextColor((HDC16)wParam, 0x00000000);
              return hGRAYBrush;
-        }
+    }
       break;
 #endif
@@ -1510 +1511 @@
    LRESULT  lRet;
    lRet = (BOOL16)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-   if (lRet)   
+   if (lRet)
     return lRet;         /* else continue message processing */
-  }             
+  }
   switch (wMsg) {
    case WM_INITDIALOG:
       return FILEDLG_WMInitDialog(hWnd, wParam, lParam);
-      
+
    case WM_MEASUREITEM:
       return FILEDLG_WMMeasureItem16(hWnd, wParam, lParam);
-    
+
    case WM_DRAWITEM:
       FILEDLG_MapDrawItemStruct(MapSL(lParam), &dis);
@@ -1527 +1528 @@
       return FILEDLG_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
   }
-  
+
   /*
   case WM_CTLCOLOR:
@@ -1541 +1542 @@
    }
    return FALSE;
-   
+
    */
   return FALSE;
@@ -1549 +1550 @@
 /***********************************************************************
  *           FileOpenDlgProc                                    [internal]
- *      Used for open and save, in fact.   
+ *      Used for open and save, in fact.
  */
 static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
@@ -1561 +1562 @@
             LRESULT lRet;
             lRet  = (BOOL)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-            if (lRet)   
+            if (lRet)
                 return lRet;         /* else continue message processing */
         }
@@ -1582 +1583 @@
          switch (HIWORD(lParam))
          {
-         case CTLCOLOR_BTN:
-             SetTextColor((HDC16)wParam, 0x00000000);
+     case CTLCOLOR_BTN:
+         SetTextColor((HDC16)wParam, 0x00000000);
              return hGRAYBrush;
-        case CTLCOLOR_STATIC:
+    case CTLCOLOR_STATIC:
              SetTextColor((HDC16)wParam, 0x00000000);
              return hGRAYBrush;
-        }
+    }
       break;
 #endif
@@ -1595 +1596 @@
 }
 
-/* ------------------ APIs ---------------------- */ 
+/* ------------------ APIs ---------------------- */
 #ifndef __WIN32OS2__
 /***********************************************************************
@@ -1609 +1610 @@
  *    unknown, there are some FIXME's left.
  */
-BOOL16 WINAPI GetOpenFileName16( 
-                                SEGPTR ofn /* [in/out] address of structure with data*/
-                                )
+BOOL16 WINAPI GetOpenFileName16(
+                SEGPTR ofn /* [in/out] address of structure with data*/
+                )
 {
     HINSTANCE hInst;
@@ -1626 +1627 @@
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
              (DLGPROC16) ptr, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1647 +1648 @@
  *    unknown. There are some FIXME's left.
  */
-BOOL16 WINAPI GetSaveFileName16( 
-                                SEGPTR ofn /* [in/out] addess of structure with data*/
-                                )
+BOOL16 WINAPI GetSaveFileName16(
+                SEGPTR ofn /* [in/out] addess of structure with data*/
+                )
 {
     HINSTANCE hInst;
@@ -1664 +1665 @@
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
              (DLGPROC16) ptr, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
-    } 
+    }
 
     TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));
@@ -1685 +1686 @@
  */
 BOOL WINAPI GetOpenFileNameA(
-        LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
+    LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
@@ -1721 +1722 @@
  */
 BOOL WINAPI GetOpenFileNameW(
-        LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
+    LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
@@ -1757 +1758 @@
  */
 BOOL WINAPI GetSaveFileNameA(
-        LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
+    LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
@@ -1775 +1776 @@
     {
         return GetFileDialog95A(ofn, SAVE_DIALOG);
-    } 
+    }
     else
     {
@@ -1793 +1794 @@
  */
 BOOL WINAPI GetSaveFileNameW(
-        LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
+    LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
@@ -1811 +1812 @@
     {
         return GetFileDialog95W(ofn, SAVE_DIALOG);
-    } 
+    }
     else
     {

trunk/src/comdlg32/filedlg95.c

@@ +1 @@
+/* $Id: filedlg95.c,v 1.24 2001-09-05 12:12:00 bird Exp $ */
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
  * FIXME: The whole concept of handling unicode is badly broken.
- *      many hook-messages expecting a pointer to a
- *      OPENFILENAMEA or W structure. With the current architecture
- *      we would have to convert the beast at every call to a hook.
- *      we have to find a better solution but if would likely cause
- *      a complete rewrite with after we shouldhandle the
- *      OPENFILENAME structure without any converting (jsch).
+ *  many hook-messages expecting a pointer to a
+ *  OPENFILENAMEA or W structure. With the current architecture
+ *  we would have to convert the beast at every call to a hook.
+ *  we have to find a better solution but if would likely cause
+ *  a complete rewrite with after we shouldhandle the
+ *  OPENFILENAME structure without any converting (jsch).
  *
  * FIXME: any hook gets a OPENFILENAMEA structure
@@ -77 +78 @@
 
 #define IsHooked(fodInfos) \
-        ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
+    ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
 /***********************************************************************
  * Data structure and global variables
@@ -86 +87 @@
   HIMAGELIST hImgList;
   int m_iIndent;      /* Indentation index */
-  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
+  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
 
 } SFOLDER,*LPSFOLDER;
@@ -216 +217 @@
  *      GetFileName95
  *
- * Creates an Open common dialog box that lets the user select 
+ * Creates an Open common dialog box that lets the user select
  * the drive, directory, and the name of a file or set of files to open.
  *
@@ -251 +252 @@
         return FALSE;
     }
-    
+
     /* old style hook messages */
     if (IsHooked(fodInfos))
@@ -260 +261 @@
       fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
-    
+
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
@@ -270 +271 @@
     if( lRes == -1)
         return FALSE;
-    
+
     return lRes;
 }
@@ -291 +292 @@
   LPSTR lpstrSavDir = NULL;
   DWORD dwFlags = 0;
-  
-  /* Initialise FileOpenDlgInfos structure*/  
+
+  /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
   ZeroMemory(fodInfos, sizeof(FileOpenDlgInfos));
-  
+
   /* Pass in the original ofn */
   fodInfos->ofnInfos = ofn;
-  
+
   /* Save original hInstance value */
   hInstance = ofn->hInstance;
@@ -316 +317 @@
   fodInfos->DlgInfos.dwDlgProp = 0;
   fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
-  
+
   switch(iDlgType)
   {
@@ -400 +401 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-  
+
   /* out arguments */
   LPWSTR lpstrFile = NULL;
@@ -437 +438 @@
     /* filter is a list...  title\0ext\0......\0\0 */
     s = ofn->lpstrFilter;
-    
+
     while (*s) s = s+strlenW(s)+1;
     s++;
@@ -520 +521 @@
   }
 #endif
-      
+
   /* restore saved IN arguments and convert OUT arguments back */
   ofn->Flags = dwFlags;
@@ -598 +599 @@
     SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
         (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
-        
+
     hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
     if(hwndStc32)
@@ -615 +616 @@
         {
           if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
-                                continue;
+                continue;
           GetWindowRect(hwndChild,&rectCtrl);
           MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-                                  
+
           /*
             Check the initial position of the controls relative to the initial
@@ -629 +630 @@
           }
           else if (rectCtrl.left >= rectTemp.right)
-          {
+      {
             rectCtrl.left += ptMoveCtl.x;
-          }
+      }
           else if (rectCtrl.top >= rectTemp.bottom)
           {
-            rectCtrl.top  += ptMoveCtl.y;
-          }
-                                        
-          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
-                                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
-                                SWP_NOSIZE | SWP_NOZORDER );
+        rectCtrl.top  += ptMoveCtl.y;
+      }
+
+          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
+                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
+                SWP_NOSIZE | SWP_NOZORDER );
         }
       } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
     }
     hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
-        
+
     if(hwndStc32)
     {
@@ -665 +666 @@
             rectCtrl.top += ptMoveCtl.y;
 
-            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
                 SWP_NOSIZE |SWP_NOZORDER );
           }
         } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-      }         
+      }
     }
 }
@@ -686 +687 @@
     {
       case WM_INITDIALOG:
-      {         
+      {
         fodInfos = (FileOpenDlgInfos *)lParam;
         lParam = (LPARAM) fodInfos->ofnInfos;
@@ -693 +694 @@
         if(fodInfos && IsHooked(fodInfos))
           return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
-        return 0;       
-      } 
+        return 0;
+      }
     }
 
     if(fodInfos && IsHooked(fodInfos))
-      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); 
-
-    return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
+      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
+
+    return DefWindowProcA(hwnd,uMsg,wParam,lParam);
 }
 
@@ -736 +737 @@
           COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
           return (HWND)NULL;
-        }
+        }
       }
 
@@ -742 +743 @@
       if(hChildDlg)
       {
-        ShowWindow(hChildDlg,SW_SHOW); 
+        ShowWindow(hChildDlg,SW_SHOW);
         return hChildDlg;
       }
@@ -758 +759 @@
       tmplate.cx = rectHwnd.right-rectHwnd.left;
       tmplate.cy = rectHwnd.bottom-rectHwnd.top;
-       
+
       return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
     }
     return (HWND)NULL;
 }
- 
+
 /***********************************************************************
 *          SendCustomDlgNotificationMessage
@@ -784 +785 @@
     {
         OFNOTIFYA ofnNotify;
-        HRESULT ret;
+    HRESULT ret;
         ofnNotify.hdr.hwndFrom=hwndParentDlg;
         ofnNotify.hdr.idFrom=0;
         ofnNotify.hdr.code = uCode;
         ofnNotify.lpOFN = fodInfos->ofnInfos;
-        TRACE("CALL NOTIFY for %x\n", uCode);
-        ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
-        TRACE("RET NOTIFY\n");
-        return ret;
+    TRACE("CALL NOTIFY for %x\n", uCode);
+    ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
+    TRACE("RET NOTIFY\n");
+    return ret;
     }
     return TRUE;
@@ -815 +816 @@
             GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath) 
-            {
+            if (lpstrFileSpec==lpstrPath)
+        {
                 char lpstrCurrentDir[MAX_PATH];
                 /* Prepend the current path */
@@ -823 +824 @@
                     snprintf((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
                 reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
-            } 
-            else 
-            {
+            }
+        else
+        {
                 lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
                 reqSize=strlen(lpstrPath);
@@ -833 +834 @@
 
         case CDM_GETFOLDERPATH:
-            SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
+        SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
             if ((LPSTR)lParam!=NULL)
                 lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
@@ -839 +840 @@
 
         case CDM_GETSPEC:
-            reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
+        reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
             if ((LPSTR)lParam!=NULL)
@@ -846 +847 @@
 
         case CDM_SETCONTROLTEXT:
-            if ( 0 != lParam )
-                SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
-            return TRUE;
+        if ( 0 != lParam )
+            SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
+        return TRUE;
 
         case CDM_HIDECONTROL:
@@ -857 +858 @@
     return TRUE;
 }
- 
+
 /***********************************************************************
  *          FileOpenDlgProc95
@@ -868 +869 @@
   TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
 #endif
-  
+
   switch(uMsg)
   {
@@ -875 +876 @@
          FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam;
 
-         /* Adds the FileOpenDlgInfos in the property list of the dialog 
+     /* Adds the FileOpenDlgInfos in the property list of the dialog
             so it will be easily accessible through a GetPropA(...) */
-         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
-
-         fodInfos->DlgInfos.hwndCustomDlg = 
-           CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
+         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
+
+         fodInfos->DlgInfos.hwndCustomDlg =
+           CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
 
          FILEDLG95_InitControls(hwnd);
          SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
-         FILEDLG95_FillControls(hwnd, wParam, lParam);
+         FILEDLG95_FillControls(hwnd, wParam, lParam);
          SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
          SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
@@ -902 +903 @@
       }
       return FALSE;
-          
+
     case WM_GETISHELLBROWSER:
       return FILEDLG95_OnWMGetIShellBrowser(hwnd);
@@ -912 +913 @@
     case WM_NOTIFY:
     {
-        LPNMHDR lpnmh = (LPNMHDR)lParam;
-        UINT stringId = -1;
-
-        /* set up the button tooltips strings */
-        if(TTN_GETDISPINFOA == lpnmh->code )
-        {
-            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam; 
-            switch(lpnmh->idFrom )
-            {
-                /* Up folder button */
-                case FCIDM_TB_UPFOLDER:
-                    stringId = IDS_UPFOLDER;
-                    break;
-                /* New folder button */
-                case FCIDM_TB_NEWFOLDER:
-                    stringId = IDS_NEWFOLDER;
-                    break;
-                /* List option button */
-                case FCIDM_TB_SMALLICON:
-                    stringId = IDS_LISTVIEW;
-                    break;
-                /* Details option button */
-                case FCIDM_TB_REPORTVIEW:
-                    stringId = IDS_REPORTVIEW;
-                    break;
-                /* Desktop button */
-                case FCIDM_TB_DESKTOP:
-                    stringId = IDS_TODESKTOP;
-                    break;
-                default:
-                    stringId = 0;
-            }
-            lpdi->hinst = COMMDLG_hInstance32; 
-            lpdi->lpszText =  (LPSTR) stringId;
-        }
+    LPNMHDR lpnmh = (LPNMHDR)lParam;
+    UINT stringId = -1;
+
+    /* set up the button tooltips strings */
+    if(TTN_GETDISPINFOA == lpnmh->code )
+    {
+        LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
+        switch(lpnmh->idFrom )
+        {
+        /* Up folder button */
+        case FCIDM_TB_UPFOLDER:
+            stringId = IDS_UPFOLDER;
+            break;
+        /* New folder button */
+        case FCIDM_TB_NEWFOLDER:
+            stringId = IDS_NEWFOLDER;
+            break;
+        /* List option button */
+        case FCIDM_TB_SMALLICON:
+            stringId = IDS_LISTVIEW;
+            break;
+        /* Details option button */
+        case FCIDM_TB_REPORTVIEW:
+            stringId = IDS_REPORTVIEW;
+            break;
+        /* Desktop button */
+        case FCIDM_TB_DESKTOP:
+            stringId = IDS_TODESKTOP;
+            break;
+        default:
+            stringId = 0;
+        }
+        lpdi->hinst = COMMDLG_hInstance32;
+        lpdi->lpszText =  (LPSTR) stringId;
+    }
         return FALSE;
     }
@@ -978 +979 @@
   {
    { HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR },
-   { COMDLG32_hInstance, 800 }                  // desktop icon
+   { COMDLG32_hInstance, 800 }          // desktop icon
   };
-  
+
   RECT rectTB;
-  
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
@@ -996 +997 @@
   MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
 
-  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL, 
+  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
         WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
-        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL); 
- 
-  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, 
-        rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
-        SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
+        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
+
+  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0,
+    rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
+    SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
 
   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
@@ -1012 +1013 @@
 
   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(LPARAM) &tbb);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); 
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
@@ -1052 +1053 @@
      are hidden and we are not using a custom template */
   if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
-       (!(fodInfos->ofnInfos->Flags & 
+       (!(fodInfos->ofnInfos->Flags &
          (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
   {
@@ -1061 +1062 @@
     /* subtract the height of the help button plus the space between
        the help button and the cancel button to the height of the dialog */
-    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left, 
-                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), 
+    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
+                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
                  SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
   }
@@ -1083 +1084 @@
 {
   LPITEMIDLIST pidlItemId = NULL;
-  
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
 
-  TRACE("dir=%s file=%s\n", 
+  TRACE("dir=%s file=%s\n",
   fodInfos->ofnInfos->lpstrInitialDir, fodInfos->ofnInfos->lpstrFile);
 
@@ -1187 +1188 @@
   /* Do not use the listview selection anymore */
   fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-  return 0; 
+  return 0;
 }
 
@@ -1204 +1205 @@
   SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
 
-  return TRUE; 
+  return TRUE;
 }
 
@@ -1210 +1211 @@
 /***********************************************************************
  *      FILEDLG95_OnOpenMultipleFiles
- *      
+ *
  * Handles the opening of multiple files.
  *
@@ -1227 +1228 @@
   lpstrFile = fodInfos->ofnInfos->lpstrFile;
   lpstrFile[0] = '\0';
-  
+
   SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
 
@@ -1233 +1234 @@
       ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST))
   {
-    LPSTR lpstrTemp = lpstrFileList; 
+    LPSTR lpstrTemp = lpstrFileList;
 
     for ( nCount = 0; nCount < nFileCount; nCount++ )
@@ -1258 +1259 @@
         return FALSE;
       }
-  
+
       /* move to the next file in the list of files */
       lpstrTemp += strlen(lpstrTemp) + 1;
@@ -1281 +1282 @@
  *
  * Ok button WM_COMMAND message handler
- * 
+ *
  * If the function succeeds, the return value is nonzero.
  */
@@ -1322 +1323 @@
       return FALSE;
   }
- 
+
   if(nFileCount > 1)
   {
@@ -1381 +1382 @@
   to a folder if the path points to a directory or the last
   valid element is a directory.
-  
+
   valid variables:
     lpstrPathAndFile: cleaned up path
@@ -1431 +1432 @@
                                lpwstrTemp, sizeof(lpwstrTemp)/sizeof(WCHAR) );
 
-        /* if the last element is a wildcard do a search */
+    /* if the last element is a wildcard do a search */
         if(strpbrk(lpszTemp1, "*?") != NULL)
         {
-          nOpenAction = ONOPEN_SEARCH;
-          break;
-        }
+      nOpenAction = ONOPEN_SEARCH;
+      break;
+    }
       }
       lpszTemp1 = lpszTemp;
@@ -1464 +1465 @@
           TRACE("value\n");
 
-          /* end dialog, return value */
+      /* end dialog, return value */
           nOpenAction = ONOPEN_OPEN;
-          break;
+      break;
         }
-        COMDLG32_SHFree(pidl);
-        pidl = NULL;
+    COMDLG32_SHFree(pidl);
+    pidl = NULL;
       }
       else
       {
-        if(*lpszTemp)   /* points to trailing null for last path element */
+    if(*lpszTemp)   /* points to trailing null for last path element */
         {
-          if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
-          {
+      if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
+      {
             FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING);
-            break;
-          }
-        }
+        break;
+      }
+    }
         else
-        {
+    {
           if(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)
-          {
+      {
             FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING);
-            break;
-          }
-        }
-        /* change to the current folder */
+        break;
+      }
+    }
+    /* change to the current folder */
         nOpenAction = ONOPEN_OPEN;
-        break;
+    break;
       }
     }
@@ -1527 +1528 @@
         /* replace the current filter */
         if(fodInfos->ShellInfos.lpstrCurrentFilter)
-          MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
+      MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
         len = MultiByteToWideChar( CP_ACP, 0, lpszTemp, -1, NULL, 0 );
         fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
@@ -1541 +1542 @@
       TRACE("ONOPEN_BROWSE\n");
       {
-        IPersistFolder2 * ppf2;
+    IPersistFolder2 * ppf2;
         if(SUCCEEDED(IShellFolder_QueryInterface( lpsf, &IID_IPersistFolder2, (LPVOID*)&ppf2)))
         {
@@ -1547 +1548 @@
           IPersistFolder2_GetCurFolder(ppf2, &pidlCurrent);
           IPersistFolder2_Release(ppf2);
-          if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
-          {
-            IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
-          }
-          else if( nOpenAction == ONOPEN_SEARCH )
-          {
+      if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
+      {
+        IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
+      }
+      else if( nOpenAction == ONOPEN_SEARCH )
+      {
             IShellView_Refresh(fodInfos->Shell.FOIShellView);
-          }
+      }
           COMDLG32_SHFree(pidlCurrent);
         }
@@ -1563 +1564 @@
       TRACE("ONOPEN_OPEN %s\n", lpstrPathAndFile);
       {
-        /* add default extension */
-        if (fodInfos->ofnInfos->lpstrDefExt)
-        {
-          if (! *PathFindExtensionA(lpstrPathAndFile))
-          {
-            strcat(lpstrPathAndFile, ".");
-            strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
-          }
-        }
+    /* add default extension */
+    if (fodInfos->ofnInfos->lpstrDefExt)
+    {
+      if (! *PathFindExtensionA(lpstrPathAndFile))
+      {
+        strcat(lpstrPathAndFile, ".");
+        strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
+      }
+    }
 
         /* Check that the size of the file does not exceed buffer size.
@@ -1579 +1580 @@
         {
           LPSTR lpszTemp;
-          
+
           /* fill destination buffer */
           strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
@@ -1589 +1590 @@
           lpszTemp = PathFindFileNameA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileOffset = lpszTemp - lpstrPathAndFile;
- 
+
           /* set extension offset */
           lpszTemp = PathFindExtensionA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? lpszTemp - lpstrPathAndFile + 1 : 0;
-    
+
           /* set the lpstrFileTitle */
           if(fodInfos->ofnInfos->lpstrFileTitle)
-          {
+      {
             LPSTR lpstrFileTitle = PathFindFileNameA(lpstrPathAndFile);
-            strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
-          }
+        strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
+      }
 
           /* ask the hook if we can close */
           if(IsHooked(fodInfos))
-          {
-            /* FIXME we are sending ASCII-structures. Does not work with NT */
-            /* first old style */
-            TRACE("---\n");
+      {
+        /* FIXME we are sending ASCII-structures. Does not work with NT */
+        /* first old style */
+        TRACE("---\n");
             CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,
                             fodInfos->DlgInfos.hwndCustomDlg,
                             fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
-            if (GetWindowLongA(hwnd, DWL_MSGRESULT))
-            {
-              TRACE("cancled\n");
-              ret = FALSE;
-              goto ret;
-            }
-          }
+        if (GetWindowLongA(hwnd, DWL_MSGRESULT))
+        {
+          TRACE("cancled\n");
+          ret = FALSE;
+          goto ret;
+        }
+      }
 
           TRACE("close\n");
-          FILEDLG95_Clean(hwnd);
+      FILEDLG95_Clean(hwnd);
           ret = EndDialog(hwnd, TRUE);
-        }
-        else
+    }
+    else
         {
           /* FIXME set error FNERR_BUFFERTOSMALL */
@@ -1650 +1651 @@
 
   /*
-   * Initialisation of the FileOpenDialogInfos structure 
+   * Initialisation of the FileOpenDialogInfos structure
    */
 
@@ -1661 +1662 @@
   if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
   {
-     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL; 
+     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
   }
   fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
@@ -1671 +1672 @@
 
   /* Construct the IShellBrowser interface */
-  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);  
-    
+  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
+
   return NOERROR;
 }
@@ -1690 +1691 @@
 
   if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView,
-                                        SVGIO_BACKGROUND,
-                                        &IID_IContextMenu,
-                                        (LPVOID*)&pcm)))
+                    SVGIO_BACKGROUND,
+                    &IID_IContextMenu,
+                    (LPVOID*)&pcm)))
   {
     CMINVOKECOMMANDINFO ci;
@@ -1739 +1740 @@
   LPITEMIDLIST pidl;
   HRESULT hres;
-  
+
   TRACE("\n");
 
@@ -1772 +1773 @@
  *      FILEDLG95_FILETYPE_Init
  *
- * Initialisation of the file type combo box 
+ * Initialisation of the file type combo box
  */
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
@@ -1782 +1783 @@
   if(fodInfos->ofnInfos->lpstrFilter)
   {
-    int nFilters = 0;   /* number of filters */
+    int nFilters = 0;   /* number of filters */
     LPSTR lpstrFilter;
     LPCSTR lpstrPos = fodInfos->ofnInfos->lpstrFilter;
@@ -1788 +1789 @@
     for(;;)
     {
-      /* filter is a list...  title\0ext\0......\0\0 
+      /* filter is a list...  title\0ext\0......\0\0
        * Set the combo item text to the title and the item data
        *  to the ext
@@ -1796 +1797 @@
 
       /* Get the title */
-      if(! *lpstrPos) break;    /* end */
+      if(! *lpstrPos) break;    /* end */
       lpstrDisplay = lpstrPos;
       lpstrPos += strlen(lpstrPos) + 1;
 
       /* Copy the extensions */
-      if (! *lpstrPos) return E_FAIL;   /* malformed filter */
+      if (! *lpstrPos) return E_FAIL;   /* malformed filter */
       if (!(lpstrExt = (LPSTR) MemAlloc(strlen(lpstrPos)+1))) return E_FAIL;
       strcpy(lpstrExt,lpstrPos);
       lpstrPos += strlen(lpstrPos) + 1;
-            
+
       /* Add the item at the end of the combo */
       CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
@@ -1816 +1817 @@
      * FIXME: lpstrCustomFilter not handled at all
      */
-  
+
     /* set default filter index */
     if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
@@ -1824 +1825 @@
     if ( fodInfos->ofnInfos->nFilterIndex > nFilters )
       fodInfos->ofnInfos->nFilterIndex = nFilters;
- 
+
     /* Set the current index selection. */
     CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1);
-  
+
     /* Get the corresponding text string from the combo box. */
     lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
@@ -1833 +1834 @@
 
     if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
-      lpstrFilter = NULL;       
+      lpstrFilter = NULL;
 
     if(lpstrFilter)
     {
       DWORD len;
-      _strlwr(lpstrFilter);     /* lowercase */
+      _strlwr(lpstrFilter); /* lowercase */
       len = MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1, NULL, 0 );
       fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
@@ -1942 +1943 @@
 
 }
-    
+
 /***********************************************************************
  *      FILEDLG95_LOOKIN_Init
  *
- * Initialisation of the look in combo box 
+ * Initialisation of the look in combo box
  */
 static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
 {
-  IShellFolder  *psfRoot, *psfDrives;
-  IEnumIDList   *lpeRoot, *lpeDrives;
-  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
+  IShellFolder  *psfRoot, *psfDrives;
+  IEnumIDList   *lpeRoot, *lpeDrives;
+  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
 
   LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos));
@@ -1982 +1983 @@
       while (S_OK == IEnumIDList_Next(lpeRoot, 1, &pidlTmp, NULL))
       {
-        FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
-
-        /* special handling for CSIDL_DRIVES */
-        if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
-        {
-          if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
-          {
-            /* enumerate the drives */
-            if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
-            {
-              while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
-              {
-                pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
-                FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
-                COMDLG32_SHFree(pidlAbsTmp);
-                COMDLG32_SHFree(pidlTmp1);
-              }
-              IEnumIDList_Release(lpeDrives);
-            }
-            IShellFolder_Release(psfDrives);
-          }
-        }
+    FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
+
+    /* special handling for CSIDL_DRIVES */
+    if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
+    {
+      if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
+      {
+        /* enumerate the drives */
+        if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
+        {
+          while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
+          {
+            pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
+            FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
+            COMDLG32_SHFree(pidlAbsTmp);
+            COMDLG32_SHFree(pidlTmp1);
+          }
+          IEnumIDList_Release(lpeDrives);
+        }
+        IShellFolder_Release(psfDrives);
+      }
+    }
         COMDLG32_SHFree(pidlTmp);
       }
@@ -2049 +2050 @@
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                               0,    
-                                               &sfi,    
-                                               sizeof (SHFILEINFOA),   
-                                               SHGFI_PIDL | SHGFI_SMALLICON |    
-                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    | 
-                                               SHGFI_DISPLAYNAME );   
+                                               0,
+                                               &sfi,
+                                               sizeof (SHFILEINFOA),
+                                               SHGFI_PIDL | SHGFI_SMALLICON |
+                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
+                                               SHGFI_DISPLAYNAME );
   }
   else
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                  0, 
-                                                  &sfi, 
+                                                  0,
+                                                  &sfi,
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON | 
-                                                  SHGFI_SYSICONINDEX | 
+                                                  SHGFI_PIDL | SHGFI_SMALLICON |
+                                                  SHGFI_SYSICONINDEX |
                                                   SHGFI_DISPLAYNAME);
   }
@@ -2086 +2087 @@
     iIndentation = 0;
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                0, 
-                                                &sfi, 
-                                                sizeof (SHFILEINFOA), 
-                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON 
+                                                0,
+                                                &sfi,
+                                                sizeof (SHFILEINFOA),
+                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
                                                 | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
 
@@ -2109 +2110 @@
   rectText.left = rectIcon.right;
   rectText.top =
-          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
+      (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
   rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET;
   rectText.bottom =
-          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
- 
+      (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
+
   /* Draw the icon from the image list */
   ImageList_Draw(ilItemImage,
                  sfi.iIcon,
-                 pDIStruct->hDC,  
-                 rectIcon.left,  
-                 rectIcon.top,  
-                 ILD_TRANSPARENT );  
+                 pDIStruct->hDC,
+                 rectIcon.left,
+                 rectIcon.top,
+                 ILD_TRANSPARENT );
 
   /* Draw the associated text */
@@ -2147 +2148 @@
     {
       LPSFOLDER tmpFolder;
-      int iItem; 
+      int iItem;
 
       iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
@@ -2153 +2154 @@
       if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,
                                                iItem)))
-        return FALSE;
+    return FALSE;
 
 
@@ -2164 +2165 @@
       break;
     }
-      
+
   }
   return FALSE;
@@ -2189 +2190 @@
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
-    
+
   tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
@@ -2204 +2205 @@
   if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
-  
+
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
   SHGetFileInfoA((LPSTR)pidl,
@@ -2210 +2211 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
+                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
@@ -2218 +2219 @@
   {
     int iItemID;
-  
+
     TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
 
@@ -2244 +2245 @@
  *      FILEDLG95_LOOKIN_InsertItemAfterParent
  *
- * Insert an item below its parent 
+ * Insert an item below its parent
  */
 static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl)
 {
-  
+
   LPITEMIDLIST pidlParent = GetParentPidl(pidl);
   int iParentPos;
@@ -2303 +2304 @@
     }
   }
-  
+
   CBSetCurSel(hwnd,iItemPos);
   liInfos->uSelectedItem = iItemPos;
@@ -2421 +2422 @@
     if (nFileSelected >= 1)
     {
-      nLength += 3;     /* first and last quotes, trailing \0 */
+      nLength += 3; /* first and last quotes, trailing \0 */
       for ( nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++ )
       {
         pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 );
-    
+
         if (pidl)
-        {
+    {
           /* get the total length of the selected file names*/
           lpstrTemp[0] = '\0';
@@ -2433 +2434 @@
 
           if ( ! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl) ) /* Ignore folders */
-          {
+      {
             nLength += strlen( lpstrTemp ) + 3;
             nFiles++;
-          }
+      }
           COMDLG32_SHFree( pidl );
-        }
+    }
       }
     }
@@ -2456 +2457 @@
 
         if (pidl)
-        {
-          /* get the file name */
+    {
+      /* get the file name */
           lpstrTemp[0] = '\0';
           GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER, lpstrTemp );
 
           if (! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) /* Ignore folders */
-          {
+      {
             if ( nFiles > 1)
-            {
+        {
               *lpstrCurrFile++ =  '\"';
               strcpy( lpstrCurrFile, lpstrTemp );
@@ -2470 +2471 @@
               strcpy( lpstrCurrFile, "\" " );
               lpstrCurrFile += 2;
-            }
-            else
-            {
+        }
+        else
+        {
               strcpy( lpstrAllFile, lpstrTemp );
-            }
-          }
+        }
+      }
           COMDLG32_SHFree( (LPVOID) pidl );
-        }
+    }
       }
     }
@@ -2495 +2496 @@
 static HRESULT COMDLG32_StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
 {
-        switch (src->uType)
-        {
-          case STRRET_WSTR:
-            WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
-            COMDLG32_SHFree(src->u.pOleStr);
-            break;
-
-          case STRRET_CSTRA:
-            lstrcpynA((LPSTR)dest, src->u.cStr, len);
-            break;
-
-          case STRRET_OFFSETA:
-            lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
-            break;
-
-          default:
-            FIXME("unknown type!\n");
-            if (len)
-            {
-              *(LPSTR)dest = '\0';
-            }
-            return(FALSE);
-        }
-        return S_OK;
+    switch (src->uType)
+    {
+      case STRRET_WSTR:
+        WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
+        COMDLG32_SHFree(src->u.pOleStr);
+        break;
+
+      case STRRET_CSTRA:
+        lstrcpynA((LPSTR)dest, src->u.cStr, len);
+        break;
+
+      case STRRET_OFFSETA:
+        lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+        break;
+
+      default:
+        FIXME("unknown type!\n");
+        if (len)
+        {
+          *(LPSTR)dest = '\0';
+        }
+        return(FALSE);
+    }
+    return S_OK;
 }
 
@@ -2528 +2529 @@
 int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPSTR * lpstrFileList, UINT * sizeUsed)
 {
-        FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-        UINT nStrCharCount = 0; /* index in src buffer */
-        UINT nFileIndex = 0;    /* index in dest buffer */
-        UINT nFileCount = 0;    /* number of files */
-        UINT nStrLen = 0;       /* length of string in edit control */
-        LPSTR lpstrEdit;        /* buffer for string from edit control */
-
-        TRACE("\n");
-
-        /* get the filenames from the edit control */
-        nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
-        lpstrEdit = MemAlloc(nStrLen+1);
-        GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
-
-        TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
-        
-        /* we might get single filename without any '"',
-         * so we need nStrLen + terminating \0 + end-of-list \0 */
-        *lpstrFileList = MemAlloc(nStrLen+2);
-        *sizeUsed = 0;
-
-        /* build 0-delimited file list from filenames */
-        while ( nStrCharCount <= nStrLen )
-        {
-          if ( lpstrEdit[nStrCharCount]=='"' )
-          {
-            nStrCharCount++;
-            while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
-            {
-              (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
-              (*sizeUsed)++;
-              nStrCharCount++;
-            }
-            (*lpstrFileList)[nFileIndex++] = '\0';
-            (*sizeUsed)++;
-            nFileCount++;
-          } 
-          nStrCharCount++;
-        }
-
-        /* single, unquoted string */
-        if ((nStrLen > 0) && (*sizeUsed == 0) )
-        {
-          strcpy(*lpstrFileList, lpstrEdit);
-          nFileIndex = strlen(lpstrEdit) + 1;
-          (*sizeUsed) = nFileIndex;
-          nFileCount = 1;
-        }
-
-        /* trailing \0 */
-        (*lpstrFileList)[nFileIndex] = '\0';
-        (*sizeUsed)++;
-
-        MemFree(lpstrEdit);
-        return nFileCount;
+    FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+    UINT nStrCharCount = 0; /* index in src buffer */
+    UINT nFileIndex = 0;    /* index in dest buffer */
+    UINT nFileCount = 0;    /* number of files */
+    UINT nStrLen = 0;   /* length of string in edit control */
+    LPSTR lpstrEdit;    /* buffer for string from edit control */
+
+    TRACE("\n");
+
+    /* get the filenames from the edit control */
+    nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
+    lpstrEdit = MemAlloc(nStrLen+1);
+    GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
+
+    TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
+
+    /* we might get single filename without any '"',
+     * so we need nStrLen + terminating \0 + end-of-list \0 */
+    *lpstrFileList = MemAlloc(nStrLen+2);
+    *sizeUsed = 0;
+
+    /* build 0-delimited file list from filenames */
+    while ( nStrCharCount <= nStrLen )
+    {
+      if ( lpstrEdit[nStrCharCount]=='"' )
+      {
+        nStrCharCount++;
+        while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
+        {
+          (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
+          (*sizeUsed)++;
+          nStrCharCount++;
+        }
+        (*lpstrFileList)[nFileIndex++] = '\0';
+        (*sizeUsed)++;
+        nFileCount++;
+      }
+      nStrCharCount++;
+    }
+
+    /* single, unquoted string */
+    if ((nStrLen > 0) && (*sizeUsed == 0) )
+    {
+      strcpy(*lpstrFileList, lpstrEdit);
+      nFileIndex = strlen(lpstrEdit) + 1;
+      (*sizeUsed) = nFileIndex;
+      nFileCount = 1;
+    }
+
+    /* trailing \0 */
+    (*lpstrFileList)[nFileIndex] = '\0';
+    (*sizeUsed)++;
+
+    MemFree(lpstrEdit);
+    return nFileCount;
 }
 
@@ -2625 +2626 @@
 LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
 {
-     
+
     STGMEDIUM medium;
     FORMATETC formatetc;
     LPITEMIDLIST pidl = NULL;
-    
+
     TRACE("sv=%p index=%u\n", doSelected, nPidlIndex);
-    
+
     /* Set the FORMATETC structure*/
     SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
@@ -2685 +2686 @@
  *      GetName
  *
- * Get the pidl's display name (relative to folder) and 
+ * Get the pidl's display name (relative to folder) and
  * put it in lpstrFileName.
- * 
+ *
  * Return NOERROR on success,
  * E_FAIL otherwise
@@ -2719 +2720 @@
  *      GetShellFolderFromPidl
  *
- * pidlRel is the item pidl relative 
+ * pidlRel is the item pidl relative
  * Return the IShellFolder of the absolute pidl
  */
@@ -2735 +2736 @@
       if(SUCCEEDED(IShellFolder_BindToObject(psfParent, pidlAbs, NULL, &IID_IShellFolder, (LPVOID*)&psf)))
       {
-        IShellFolder_Release(psfParent);
+    IShellFolder_Release(psfParent);
         return psf;
       }
@@ -2755 +2756 @@
 
   TRACE("%p\n", pidl);
-  
+
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
-     
+
   return pidlParent;
 }
@@ -2765 +2766 @@
  *      GetPidlFromName
  *
- * returns the pidl of the file name relative to folder 
+ * returns the pidl of the file name relative to folder
  * NULL if an error occurred
  */
@@ -2779 +2780 @@
   if(!*lpcstrFileName) return NULL;
 
-  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);  
+  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);
 
   if(!lpsf)
@@ -2789 +2790 @@
   else
   {
-    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL); 
+    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL);
   }
   return pidl;
@@ -2798 +2799 @@
 BOOL IsPidlFolder (LPSHELLFOLDER psf, LPITEMIDLIST pidl)
 {
-        ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
-        HRESULT ret;
-        
-        TRACE("%p, %p\n", psf, pidl);
-        
-        ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
-        
-        TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
-        /* see documentation shell 4.1*/
+    ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
+    HRESULT ret;
+
+    TRACE("%p, %p\n", psf, pidl);
+
+    ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
+
+    TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
+    /* see documentation shell 4.1*/
         return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
 }
@@ -2841 +2842 @@
 
   return bBrowseSelFolder;
-} 
+}
 
 /*

trunk/src/comdlg32/filedlgbrowser.c

@@ +1 @@
+/* $Id: filedlgbrowser.c,v 1.9 2001-09-05 12:12:01 bird Exp $ */
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
- * 
+ *
  *
  */
@@ -59 +60 @@
 *   External Prototypes
 */
-extern const char *FileOpenDlgInfosStr; 
+extern const char *FileOpenDlgInfosStr;
 
 extern HRESULT          GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName);
@@ -91 +92 @@
 static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
 {
-        TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
-
-        switch (src->uType)
-        {
-          case STRRET_WSTR:
-            lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
-            COMDLG32_SHFree(src->u.pOleStr);
-            break;
-
-          case STRRET_CSTRA:
+    TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
+
+    switch (src->uType)
+    {
+      case STRRET_WSTR:
+        lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
+        COMDLG32_SHFree(src->u.pOleStr);
+        break;
+
+      case STRRET_CSTRA:
             if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len ))
                 ((LPWSTR)dest)[len-1] = 0;
-            break;
-
-          case STRRET_OFFSETA:
-            if (pidl)
-            {
+        break;
+
+      case STRRET_OFFSETA:
+        if (pidl)
+        {
                 if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset,
                                                  -1, (LPWSTR)dest, len ))
                     ((LPWSTR)dest)[len-1] = 0;
-            }
-            break;
-
-          default:
-            FIXME("unknown type!\n");
-            if (len)
-            { *(LPWSTR)dest = '\0';
-            }
-            return(FALSE);
-        }
-        return S_OK;
+        }
+        break;
+
+      default:
+        FIXME("unknown type!\n");
+        if (len)
+        { *(LPWSTR)dest = '\0';
+        }
+        return(FALSE);
+    }
+    return S_OK;
 }
 
 /*
- *      IShellBrowser
+ *  IShellBrowser
  */
- 
+
 /**************************************************************************
 *  IShellBrowserImpl_Construct
@@ -158 +159 @@
 */
 HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
-                                            REFIID riid, 
+                                            REFIID riid,
                                             LPVOID *ppvObj)
 {
@@ -168 +169 @@
 
     if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
-    { *ppvObj = This; 
+    { *ppvObj = This;
     }
     else if(IsEqualIID(riid, &IID_IOleWindow))  /*IOleWindow*/
@@ -215 +216 @@
     TRACE("(%p)\n", This);
 
-    if (!--(This->ref)) 
-    { 
+    if (!--(This->ref))
+    {
       HeapFree(GetProcessHeap(),0, This);
       return 0;
@@ -235 +236 @@
 *
 *  Note : We will never be window less in the File Open dialog
-*  
-*/
-HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,  
+*
+*/
+HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,
                                            HWND * phwnd)
 {
@@ -249 +250 @@
     *phwnd = This->hwndOwner;
 
-    return (*phwnd) ? S_OK : E_UNEXPECTED; 
+    return (*phwnd) ? S_OK : E_UNEXPECTED;
 
 }
@@ -276 +277 @@
 *  See Windows documentation on IShellBrowser::BrowseObject for more details
 *
-*  This function will override user specified flags and will always 
-*  use SBSP_DEFBROWSER and SBSP_DEFMODE.  
-*/
-HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, 
-                                              LPCITEMIDLIST pidl, 
+*  This function will override user specified flags and will always
+*  use SBSP_DEFBROWSER and SBSP_DEFMODE.
+*/
+HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
+                                              LPCITEMIDLIST pidl,
                                               UINT wFlags)
 {
@@ -301 +302 @@
     if(wFlags & SBSP_RELATIVE)
     {
-        
+
         /* SBSP_RELATIVE  A relative pidl (relative from the current folder) */
         if(FAILED(hRes = IShellFolder_BindToObject(fodInfos->Shell.FOIShellFolder,
@@ -307 +308 @@
         {
             ERR("bind to object failed\n");
-            return hRes;
+        return hRes;
         }
         /* create an absolute pidl */
@@ -326 +327 @@
         psfTmp = GetShellFolderFromPidl(pidlTmp);
     }
-    
+
     if(!psfTmp)
     {
@@ -333 +334 @@
     }
 
-    /* If the pidl to browse to is equal to the actual pidl ... 
+    /* If the pidl to browse to is equal to the actual pidl ...
        do nothing and pretend you did it*/
     if(COMDLG32_PIDL_ILIsEqual(pidlTmp,fodInfos->ShellInfos.pidlAbsCurrent))
     {
         IShellFolder_Release(psfTmp);
-        COMDLG32_SHFree(pidlTmp);
+    COMDLG32_SHFree(pidlTmp);
         TRACE("keep current folder\n");
         return NOERROR;
@@ -395 +396 @@
 
     /* changes the tab order of the ListView to reflect the window's File Dialog */
-    hDlgWnd = GetDlgItem(GetParent(hwndView), IDC_LOOKIN); 
+    hDlgWnd = GetDlgItem(GetParent(hwndView), IDC_LOOKIN);
     SetWindowPos(hwndView, hDlgWnd, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE);
 
@@ -402 +403 @@
       SetFocus(fodInfos->ShellInfos.hwndView);
 
-    return hRes; 
+    return hRes;
 error:
     ERR("Failed with error 0x%08lx\n", hRes);
@@ -411 +412 @@
 *  IShellBrowserImpl_EnableModelessSB
 */
-HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,    
+HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,
                                               BOOL fEnable)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -426 +427 @@
 *  IShellBrowserImpl_GetControlWindow
 */
-HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,    
-                                              UINT id,    
+HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,
+                                              UINT id,
                                               HWND *lphwnd)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -442 +443 @@
 */
 HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
-                                                DWORD grfMode,    
+                                                DWORD grfMode,
                                                 LPSTREAM *ppStrm)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -452 +453 @@
     /* Feature not implemented */
     return E_NOTIMPL;
-}       
+}
 /**************************************************************************
 *  IShellBrowserImpl_InsertMenusSB
@@ -459 +460 @@
                                            HMENU hmenuShared,
                                            LPOLEMENUGROUPWIDTHS lpMenuWidths)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -473 +474 @@
 HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
                                                 IShellView *ppshv)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
+
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
 /**************************************************************************
 *  IShellBrowserImpl_QueryActiveShellView
@@ -487 +488 @@
 HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
                                                   IShellView **ppshv)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -503 +504 @@
     IShellView_AddRef(fodInfos->Shell.FOIShellView);
     return NOERROR;
-}   
+}
 /**************************************************************************
 *  IShellBrowserImpl_RemoveMenusSB
@@ -509 +510 @@
 HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
                                            HMENU hmenuShared)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
+
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
 /**************************************************************************
 *  IShellBrowserImpl_SendControlMsg
 */
-HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,    
-                                            UINT id,    
-                                            UINT uMsg,    
-                                            WPARAM wParam,    
+HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
+                                            UINT id,
+                                            UINT uMsg,
+                                            WPARAM wParam,
                                             LPARAM lParam,
                                             LRESULT *pret)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
     LRESULT lres;
-    
+
     TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
 
@@ -538 +539 @@
       case FCW_TOOLBAR:
         lres = SendDlgItemMessageA( This->hwndOwner, IDC_TOOLBAR, uMsg, wParam, lParam);
-        break;
+    break;
       default:
         FIXME("ctrl id: %x\n", id);
@@ -550 +551 @@
 */
 HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
-                                       HMENU hmenuShared,    
+                                       HMENU hmenuShared,
                                        HOLEMENU holemenuReserved,
                                        HWND hwndActiveObject)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
+
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
 /**************************************************************************
 *  IShellBrowserImpl_SetStatusTextSB
@@ -567 +568 @@
 HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
                                              LPCOLESTR lpszStatusText)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
+
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
 /**************************************************************************
 *  IShellBrowserImpl_SetToolbarItems
 */
 HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
-                                             LPTBBUTTON lpButtons,    
-                                             UINT nButtons,    
+                                             LPTBBUTTON lpButtons,
+                                             UINT nButtons,
                                              UINT uFlags)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
+
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
 /**************************************************************************
 *  IShellBrowserImpl_TranslateAcceleratorSB
 */
 HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
-                                                    LPMSG lpmsg,    
+                                                    LPMSG lpmsg,
                                                     WORD wID)
-                                              
+
 {
     ICOM_THIS(IShellBrowserImpl, iface);
@@ -644 +645 @@
 */
 HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(
-        ICommDlgBrowser *iface,
-        REFIID riid, 
-        LPVOID *ppvObj)
+    ICommDlgBrowser *iface,
+    REFIID riid,
+    LPVOID *ppvObj)
 {
     _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface);
@@ -693 +694 @@
     TRACE("(%p)\n", This);
 
-    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);  
-    
+    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
+
     /* If the selected object is not a folder, send a IDOK command to parent window */
     if((pidl = GetPidlFromDataObject(fodInfos->Shell.FOIDataObject, 1)))
@@ -702 +703 @@
         ULONG  ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
         IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
-        if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) )
-        {
+    if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) )
+    {
           hRes = IShellBrowser_BrowseObject((IShellBrowser *)This,pidl,SBSP_RELATIVE);
-        }
+    }
         else
-        {
+    {
           /* Tell the dialog that the user selected a file */
-          hRes = PostMessageA(This->hwndOwner, WM_COMMAND, IDOK, 0L);
-        }
+      hRes = PostMessageA(This->hwndOwner, WM_COMMAND, IDOK, 0L);
+    }
 
         /* Free memory used by pidl */
@@ -737 +738 @@
         case CDBOSC_SETFOCUS:
              /* FIXME: Reset the default button.
-                This should be taken care of by defdlg. If control
-                other than button receives focus the default button
-                should be restored. */
+            This should be taken care of by defdlg. If control
+            other than button receives focus the default button
+            should be restored. */
              SendMessageA(This->hwndOwner, DM_SETDEFID, IDOK, 0);
 
             break;
-        case CDBOSC_KILLFOCUS: 
-            {
-                FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
-                if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-                    SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+        case CDBOSC_KILLFOCUS:
+        {
+        FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
+        if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+            SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
             }
             break;
@@ -753 +754 @@
             return IShellBrowserImpl_ICommDlgBrowser_OnSelChange(iface,ppshv);
         case CDBOSC_RENAME:
-            /* nothing to do */
+        /* nothing to do */
             break;
     }
 
-    return NOERROR;     
+    return NOERROR;
 }
 
@@ -763 +764 @@
 *  IShellBrowserImpl_ICommDlgBrowser_IncludeObject
 */
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, 
+HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface,
                                                                IShellView * ppshv,
                                                                LPCITEMIDLIST pidl)
@@ -780 +781 @@
     ulAttr = SFGAO_HIDDEN | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR | SFGAO_LINK;
     IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
-    
+
     if( (ulAttr & SFGAO_HIDDEN)                                         /* hidden */
       | !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */
@@ -786 +787 @@
 
     /* always include directorys and links */
-    if(ulAttr & (SFGAO_FOLDER | SFGAO_LINK)) 
+    if(ulAttr & (SFGAO_FOLDER | SFGAO_LINK))
         return S_OK;
 
@@ -797 +798 @@
       if (SUCCEEDED(COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)))
       {
-          if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
+      if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
           return S_OK;
       }
@@ -807 +808 @@
 /**************************************************************************
 *  IShellBrowserImpl_ICommDlgBrowser_OnSelChange
-*/  
+*/
 HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv)
 {
@@ -816 +817 @@
     fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
     TRACE("(%p do=%p view=%p)\n", This, fodInfos->Shell.FOIDataObject, fodInfos->Shell.FOIShellView);
-    
+
     /* release old selections */
     if (fodInfos->Shell.FOIDataObject)
       IDataObject_Release(fodInfos->Shell.FOIDataObject);
-    
+
     /* get a new DataObject from the ShellView */
     if(FAILED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView, SVGIO_SELECTION,
                               &IID_IDataObject, (LPVOID*)&fodInfos->Shell.FOIDataObject)))
       return E_FAIL;
-                                          
+
     FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner);
 
@@ -856 +857 @@
 */
 HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface(
-        IServiceProvider *iface,
-        REFIID riid, 
-        LPVOID *ppvObj)
+    IServiceProvider *iface,
+    REFIID riid,
+    LPVOID *ppvObj)
 {
     _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
@@ -895 +896 @@
 *
 * NOTES
-*  the w2k shellview asks for 
+*  the w2k shellview asks for
 *   guidService = SID_STopLevelBrowser
 *   riid = IShellBrowser
@@ -904 +905 @@
 
 HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService(
-        IServiceProvider * iface,
-        REFGUID guidService,
-        REFIID riid,
-        void** ppv)
+    IServiceProvider * iface,
+    REFGUID guidService,
+    REFIID riid,
+    void** ppv)
 {
     _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);

trunk/src/comdlg32/filetitle.c

@@ +1 @@
+/* $Id: filetitle.c,v 1.5 2001-09-05 12:12:01 bird Exp $ */
 /*
  * COMMDLG - File Dialogs
@@ -13 +14 @@
 #include "debugtools.h"
 
-#include "heap.h"       /* Has to go */
+#include "heap.h"   /* Has to go */
 
 DEFAULT_DEBUG_CHANNEL(commdlg)
@@ -20 +21 @@
 
 /***********************************************************************
- *      GetFileTitleA           (COMDLG32.8)
+ *  GetFileTitleA       (COMDLG32.8)
  *
  */
 short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
 {
-        int i, len;
+    int i, len;
 
-        TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
+    TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
 
-        if(lpFile == NULL || lpTitle == NULL)
-                return -1;
+    if(lpFile == NULL || lpTitle == NULL)
+        return -1;
 
-        len = strlen(lpFile);
+    len = strlen(lpFile);
 
-        if (len == 0)
-                return -1;
+    if (len == 0)
+        return -1;
 
-        if(strpbrk(lpFile, "*[]"))
-                return -1;
+    if(strpbrk(lpFile, "*[]"))
+        return -1;
 
-        len--;
+    len--;
 
-        if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
-                return -1;
+    if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
+        return -1;
 
-        for(i = len; i >= 0; i--)
-        {
-                if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
-                {
-                        i++;
-                        break;
-                }
-        }
+    for(i = len; i >= 0; i--)
+    {
+        if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
+        {
+            i++;
+            break;
+        }
+    }
 
-        if(i == -1)
-                i++;
+    if(i == -1)
+        i++;
 
-        TRACE("---> '%s' \n", &lpFile[i]);
-    
-        len = strlen(lpFile+i)+1;
-        if(cbBuf < len)
-                return len;
+    TRACE("---> '%s' \n", &lpFile[i]);
 
-        strncpy(lpTitle, &lpFile[i], len);
-        return 0;
+    len = strlen(lpFile+i)+1;
+    if(cbBuf < len)
+        return len;
+
+    strncpy(lpTitle, &lpFile[i], len);
+    return 0;
 }
 
 
 /***********************************************************************
- *      GetFileTitleW           (COMDLG32.9)
+ *  GetFileTitleW       (COMDLG32.9)
  *
  */
 short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
 {
-        LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);      /* Has to go */
-        LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
-        short   ret;
+    LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);  /* Has to go */
+    LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
+    short   ret;
 
-        ret = GetFileTitleA(file, title, cbBuf);
+    ret = GetFileTitleA(file, title, cbBuf);
 
-        lstrcpynAtoW(lpTitle, title, cbBuf);
-        HeapFree(GetProcessHeap(), 0, file);
-        HeapFree(GetProcessHeap(), 0, title);
-        return ret;
+    lstrcpynAtoW(lpTitle, title, cbBuf);
+    HeapFree(GetProcessHeap(), 0, file);
+    HeapFree(GetProcessHeap(), 0, title);
+    return ret;
 }
 
@@ -89 +90 @@
 #ifndef __WIN32OS2__
 /***********************************************************************
- *      GetFileTitle16          (COMMDLG.27)
+ *  GetFileTitle16      (COMMDLG.27)
  */
 short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
 {
-        return GetFileTitleA(lpFile, lpTitle, cbBuf);
+    return GetFileTitleA(lpFile, lpTitle, cbBuf);
 }
 #endif

trunk/src/comdlg32/finddlg32.c

@@ +1 @@
+/* $Id: finddlg32.c,v 1.4 2001-09-05 12:12:01 bird Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit)
@@ -24 +25 @@
 /*-----------------------------------------------------------------------*/
 
-static UINT             FindReplaceMessage;
-static UINT             HelpMessage;
-
-#define FR_MASK (FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD | FR_REPLACEALL | FR_REPLACE | FR_FINDNEXT | FR_DIALOGTERM)
+static UINT     FindReplaceMessage;
+static UINT     HelpMessage;
+
+#define FR_MASK (FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD | FR_REPLACEALL | FR_REPLACE | FR_FINDNEXT | FR_DIALOGTERM)
 /* CRITICAL_SECTION COMDLG32_CritSect; */
 
@@ -49 +50 @@
 
 /***********************************************************************
- *      COMDLG32_FR_GetFlags                    [internal]
+ *  COMDLG32_FR_GetFlags            [internal]
  * Returns the button state that needs to be reported to the caller.
- *      RETURNS
- *              Current state of check and radio buttons
+ *  RETURNS
+ *      Current state of check and radio buttons
  */
 static DWORD COMDLG32_FR_GetFlags(HWND hDlgWnd)
 {
-        DWORD flags = 0;
-        if(IsDlgButtonChecked(hDlgWnd, rad2) == BST_CHECKED)
-                flags |= FR_DOWN;
-        if(IsDlgButtonChecked(hDlgWnd, chx1) == BST_CHECKED)
-                flags |= FR_WHOLEWORD;
-        if(IsDlgButtonChecked(hDlgWnd, chx2) == BST_CHECKED)
-                flags |= FR_MATCHCASE;
+    DWORD flags = 0;
+    if(IsDlgButtonChecked(hDlgWnd, rad2) == BST_CHECKED)
+            flags |= FR_DOWN;
+    if(IsDlgButtonChecked(hDlgWnd, chx1) == BST_CHECKED)
+            flags |= FR_WHOLEWORD;
+    if(IsDlgButtonChecked(hDlgWnd, chx2) == BST_CHECKED)
+            flags |= FR_MATCHCASE;
         return flags;
 }
 
 /***********************************************************************
- *      COMDLG32_FR_HandleWMCommand             [internal]
+ *  COMDLG32_FR_HandleWMCommand     [internal]
  * Handle WM_COMMAND messages...
  */
 static void COMDLG32_FR_HandleWMCommand(HWND hDlgWnd, COMDLG32_FR_Data *pData, int Id, int NotifyCode)
 {
-        DWORD flag;
-
-        pData->user_fr.fra->Flags &= ~FR_MASK;  /* Clear return flags */
-        if(pData->fr.Flags & FR_WINE_REPLACE)   /* Replace always goes down... */
-                pData->user_fr.fra->Flags |= FR_DOWN;
-
-        if(NotifyCode == BN_CLICKED)
-        {
-                switch(Id)
-                {
-                case IDOK: /* Find Next */
-                        if(GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
+    DWORD flag;
+
+    pData->user_fr.fra->Flags &= ~FR_MASK;  /* Clear return flags */
+    if(pData->fr.Flags & FR_WINE_REPLACE)   /* Replace always goes down... */
+        pData->user_fr.fra->Flags |= FR_DOWN;
+
+    if(NotifyCode == BN_CLICKED)
+        {
+            switch(Id)
+        {
+        case IDOK: /* Find Next */
+            if(GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
                         {
-                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_FINDNEXT;
+                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_FINDNEXT;
                                 if(pData->fr.Flags & FR_WINE_UNICODE)
                                 {
@@ -94 +95 @@
                                 else
                                 {
-                                        strcpy(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                    strcpy(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
                                 }
-                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
                         }
-                        break;
-
-                case IDCANCEL:
-                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_DIALOGTERM;
-                        SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
-                        DestroyWindow(hDlgWnd);
-                        break;
+            break;
+
+        case IDCANCEL:
+            pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_DIALOGTERM;
+            SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                    DestroyWindow(hDlgWnd);
+            break;
 
                 case psh2: /* Replace All */
-                        flag = FR_REPLACEALL;
+                    flag = FR_REPLACEALL;
                         goto Replace;
 
                 case psh1: /* Replace */
-                        flag = FR_REPLACE;
+                    flag = FR_REPLACE;
 Replace:
-                        if((pData->fr.Flags & FR_WINE_REPLACE)
+            if((pData->fr.Flags & FR_WINE_REPLACE)
                         && GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
                         {
-                                pData->fr.lpstrReplaceWith[0] = 0; /* In case the next GetDlgItemText Fails */
-                                GetDlgItemTextA(hDlgWnd, edt2, pData->fr.lpstrReplaceWith, pData->fr.wReplaceWithLen);
-                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | flag;
+                pData->fr.lpstrReplaceWith[0] = 0; /* In case the next GetDlgItemText Fails */
+                GetDlgItemTextA(hDlgWnd, edt2, pData->fr.lpstrReplaceWith, pData->fr.wReplaceWithLen);
+                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | flag;
                                 if(pData->fr.Flags & FR_WINE_UNICODE)
                                 {
@@ -130 +131 @@
                                 else
                                 {
-                                        strcpy(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
-                                        strcpy(pData->user_fr.fra->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
+                                    strcpy(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                    strcpy(pData->user_fr.fra->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
                                 }
-                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
                         }
-                        break;
-
-                case pshHelp:
-                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd);
-                        SendMessageA(pData->fr.hwndOwner, HelpMessage, (WPARAM)hDlgWnd, (LPARAM)pData->user_fr.fra);
-                        break;
+            break;
+
+        case pshHelp:
+            pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd);
+            SendMessageA(pData->fr.hwndOwner, HelpMessage, (WPARAM)hDlgWnd, (LPARAM)pData->user_fr.fra);
+            break;
                 }
         }
         else if(NotifyCode == EN_CHANGE && Id == edt1)
-        {
-                BOOL enable = SendDlgItemMessageA(hDlgWnd, edt1, WM_GETTEXTLENGTH, 0, 0) > 0;
-                EnableWindow(GetDlgItem(hDlgWnd, IDOK), enable);
+    {
+        BOOL enable = SendDlgItemMessageA(hDlgWnd, edt1, WM_GETTEXTLENGTH, 0, 0) > 0;
+        EnableWindow(GetDlgItem(hDlgWnd, IDOK), enable);
                 if(pData->fr.Flags & FR_WINE_REPLACE)
                 {
-                        EnableWindow(GetDlgItem(hDlgWnd, psh1), enable);
-                        EnableWindow(GetDlgItem(hDlgWnd, psh2), enable);
+            EnableWindow(GetDlgItem(hDlgWnd, psh1), enable);
+            EnableWindow(GetDlgItem(hDlgWnd, psh2), enable);
                 }
-        }
-}
-
-/***********************************************************************
- *      COMDLG32_FindReplaceDlgProc             [internal]
+    }
+}
+
+/***********************************************************************
+ *  COMDLG32_FindReplaceDlgProc     [internal]
  * [Find/Replace]Text32[A/W] window procedure.
  */
 static BOOL CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-        COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
-        BOOL retval = TRUE;;
-
-        if(iMsg == WM_INITDIALOG)
+    COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
+    BOOL retval = TRUE;;
+
+    if(iMsg == WM_INITDIALOG)
         {
                 pdata = (COMDLG32_FR_Data *)lParam;
-                if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
+            if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
                 {
-                        ERR("Could not Set prop; invent a gracefull exit?...\n");
-                        DestroyWindow(hDlgWnd);
+            ERR("Could not Set prop; invent a gracefull exit?...\n");
+                    DestroyWindow(hDlgWnd);
                         return FALSE;
                 }
-                SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wFindWhatLen, 0);
-                SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat);
+            SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wFindWhatLen, 0);
+            SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat);
                 if(pdata->fr.Flags & FR_WINE_REPLACE)
                 {
-                        SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wReplaceWithLen, 0);
-                        SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith);
+                SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wReplaceWithLen, 0);
+                SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith);
                 }
 
-                if(!(pdata->fr.Flags & FR_SHOWHELP))
-                        ShowWindow(GetDlgItem(hDlgWnd, pshHelp), SW_HIDE);
-                if(pdata->fr.Flags & FR_HIDEUPDOWN)
-                {
-                        ShowWindow(GetDlgItem(hDlgWnd, rad1), SW_HIDE);
-                        ShowWindow(GetDlgItem(hDlgWnd, rad2), SW_HIDE);
-                        ShowWindow(GetDlgItem(hDlgWnd, grp1), SW_HIDE);
-                }
-                else if(pdata->fr.Flags & FR_NOUPDOWN)
-                {
-                        EnableWindow(GetDlgItem(hDlgWnd, rad1), FALSE);
-                        EnableWindow(GetDlgItem(hDlgWnd, rad2), FALSE);
-                        EnableWindow(GetDlgItem(hDlgWnd, grp1), FALSE);
-                }
+            if(!(pdata->fr.Flags & FR_SHOWHELP))
+            ShowWindow(GetDlgItem(hDlgWnd, pshHelp), SW_HIDE);
+            if(pdata->fr.Flags & FR_HIDEUPDOWN)
+            {
+            ShowWindow(GetDlgItem(hDlgWnd, rad1), SW_HIDE);
+            ShowWindow(GetDlgItem(hDlgWnd, rad2), SW_HIDE);
+            ShowWindow(GetDlgItem(hDlgWnd, grp1), SW_HIDE);
+            }
+            else if(pdata->fr.Flags & FR_NOUPDOWN)
+            {
+            EnableWindow(GetDlgItem(hDlgWnd, rad1), FALSE);
+            EnableWindow(GetDlgItem(hDlgWnd, rad2), FALSE);
+            EnableWindow(GetDlgItem(hDlgWnd, grp1), FALSE);
+            }
                 else
                 {
-                        SendDlgItemMessageA(hDlgWnd, rad1, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? 0 : BST_CHECKED, 0);
-                        SendDlgItemMessageA(hDlgWnd, rad2, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? BST_CHECKED : 0, 0);
+            SendDlgItemMessageA(hDlgWnd, rad1, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? 0 : BST_CHECKED, 0);
+            SendDlgItemMessageA(hDlgWnd, rad2, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? BST_CHECKED : 0, 0);
                 }
 
-                if(pdata->fr.Flags & FR_HIDEMATCHCASE)
-                        ShowWindow(GetDlgItem(hDlgWnd, chx2), SW_HIDE);
-                else if(pdata->fr.Flags & FR_NOMATCHCASE)
-                        EnableWindow(GetDlgItem(hDlgWnd, chx2), FALSE);
+            if(pdata->fr.Flags & FR_HIDEMATCHCASE)
+            ShowWindow(GetDlgItem(hDlgWnd, chx2), SW_HIDE);
+            else if(pdata->fr.Flags & FR_NOMATCHCASE)
+            EnableWindow(GetDlgItem(hDlgWnd, chx2), FALSE);
                 else
-                        SendDlgItemMessageA(hDlgWnd, chx2, BM_SETCHECK, pdata->fr.Flags & FR_MATCHCASE ? BST_CHECKED : 0, 0);
-
-                if(pdata->fr.Flags & FR_HIDEWHOLEWORD)
-                        ShowWindow(GetDlgItem(hDlgWnd, chx1), SW_HIDE);
-                else if(pdata->fr.Flags & FR_NOWHOLEWORD)
-                        EnableWindow(GetDlgItem(hDlgWnd, chx1), FALSE);
+            SendDlgItemMessageA(hDlgWnd, chx2, BM_SETCHECK, pdata->fr.Flags & FR_MATCHCASE ? BST_CHECKED : 0, 0);
+
+            if(pdata->fr.Flags & FR_HIDEWHOLEWORD)
+            ShowWindow(GetDlgItem(hDlgWnd, chx1), SW_HIDE);
+            else if(pdata->fr.Flags & FR_NOWHOLEWORD)
+            EnableWindow(GetDlgItem(hDlgWnd, chx1), FALSE);
                 else
-                        SendDlgItemMessageA(hDlgWnd, chx1, BM_SETCHECK, pdata->fr.Flags & FR_WHOLEWORD ? BST_CHECKED : 0, 0);
-
-                /* We did the init here, now call the hook if requested */
-
-                /* We do not do ShowWindow if hook exists and is FALSE  */
-                /*   per MSDN Article Q96135                            */
-                if((pdata->fr.Flags & FR_ENABLEHOOK)
-                     && ! pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, (LPARAM) &pdata->fr))
-                        return TRUE;
-                ShowWindow(hDlgWnd, SW_SHOWNORMAL);
-                UpdateWindow(hDlgWnd);
+            SendDlgItemMessageA(hDlgWnd, chx1, BM_SETCHECK, pdata->fr.Flags & FR_WHOLEWORD ? BST_CHECKED : 0, 0);
+
+        /* We did the init here, now call the hook if requested */
+
+        /* We do not do ShowWindow if hook exists and is FALSE  */
+        /*   per MSDN Article Q96135                            */
+                if((pdata->fr.Flags & FR_ENABLEHOOK)
+                 && ! pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, (LPARAM) &pdata->fr))
                 return TRUE;
-        }
-
-        if(pdata && (pdata->fr.Flags & FR_ENABLEHOOK))
-        {
-                retval = pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, lParam);
-        }
-        else
-                retval = FALSE;
-
-        if(pdata && !retval)
-        {
-                retval = TRUE;
-                switch(iMsg)
-                {
-                case WM_COMMAND:
-                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, LOWORD(wParam), HIWORD(wParam));
-                        break;
-
-                case WM_CLOSE:
-                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, IDCANCEL, BN_CLICKED);
-                        break;
-
-                case WM_HELP:
-                        /* Heeeeelp! */
-                        FIXME("Got WM_HELP. Who is gonna supply it?\n");
-                        break;
-
-                case WM_CONTEXTMENU:
-                        /* Heeeeelp! */
-                        FIXME("Got WM_CONTEXTMENU. Who is gonna supply it?\n");
-                        break;
-                /* FIXME: Handle F1 help */
-
-                default:
-                        retval = FALSE; /* We did not handle the message */
-                }
+        ShowWindow(hDlgWnd, SW_SHOWNORMAL);
+        UpdateWindow(hDlgWnd);
+                return TRUE;
+        }
+
+    if(pdata && (pdata->fr.Flags & FR_ENABLEHOOK))
+    {
+        retval = pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, lParam);
+    }
+    else
+        retval = FALSE;
+
+        if(pdata && !retval)
+        {
+            retval = TRUE;
+        switch(iMsg)
+            {
+            case WM_COMMAND:
+            COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, LOWORD(wParam), HIWORD(wParam));
+                    break;
+
+            case WM_CLOSE:
+            COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, IDCANCEL, BN_CLICKED);
+                break;
+
+            case WM_HELP:
+                /* Heeeeelp! */
+                FIXME("Got WM_HELP. Who is gonna supply it?\n");
+                    break;
+
+            case WM_CONTEXTMENU:
+                /* Heeeeelp! */
+                FIXME("Got WM_CONTEXTMENU. Who is gonna supply it?\n");
+                    break;
+        /* FIXME: Handle F1 help */
+
+            default:
+                retval = FALSE; /* We did not handle the message */
+            }
         }
 
@@ -269 +270 @@
         if(iMsg == WM_DESTROY)
         {
-                RemovePropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
-                HeapFree(GetProcessHeap(), 0, pdata);
+            RemovePropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
+            HeapFree(GetProcessHeap(), 0, pdata);
         }
 
@@ -277 +278 @@
 
 /***********************************************************************
- *      COMDLG32_FR_CheckPartial                [internal]
+ *  COMDLG32_FR_CheckPartial        [internal]
  * Check various fault conditions in the supplied parameters that
  * cause an extended error to be reported.
- *      RETURNS
- *              TRUE: Success
- *              FALSE: Failure
+ *  RETURNS
+ *      TRUE: Success
+ *      FALSE: Failure
  */
 static BOOL COMDLG32_FR_CheckPartial(
-        LPFINDREPLACEA pfr,     /* [in] Find structure */
-        BOOL Replace            /* [in] True if called as replace */
+    LPFINDREPLACEA pfr, /* [in] Find structure */
+        BOOL Replace        /* [in] True if called as replace */
 ) {
-        if(!pfr)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_GENERALCODES);
-                return FALSE;
-        }
+    if(!pfr)
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_GENERALCODES);
+                return FALSE;
+    }
 
         if(pfr->lStructSize != sizeof(FINDREPLACEA))
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
-                return FALSE;
+            COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
+            return FALSE;
         }
 
         if(!IsWindow(pfr->hwndOwner))
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_DIALOGFAILURE);
-                return FALSE;
-        }
-
-        if((pfr->wFindWhatLen < 1 || !pfr->lpstrFindWhat)
+            COMDLG32_SetCommDlgExtendedError(CDERR_DIALOGFAILURE);
+            return FALSE;
+        }
+
+    if((pfr->wFindWhatLen < 1 || !pfr->lpstrFindWhat)
         ||(Replace && (pfr->wReplaceWithLen < 1 || !pfr->lpstrReplaceWith)))
         {
-                COMDLG32_SetCommDlgExtendedError(FRERR_BUFFERLENGTHZERO);
-                return FALSE;
-        }
-
-        if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRINGA)) == 0)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
-                return FALSE;
-        }
-        if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRINGA)) == 0)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+            COMDLG32_SetCommDlgExtendedError(FRERR_BUFFERLENGTHZERO);
+                return FALSE;
+        }
+
+    if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRINGA)) == 0)
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+                return FALSE;
+        }
+    if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRINGA)) == 0)
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
                 return FALSE;
         }
@@ -326 +327 @@
         if((pfr->Flags & FR_ENABLEHOOK) && !pfr->lpfnHook)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOHOOK);
+            COMDLG32_SetCommDlgExtendedError(CDERR_NOHOOK);
                 return FALSE;
         }
@@ -332 +333 @@
         if((pfr->Flags & (FR_ENABLETEMPLATE | FR_ENABLETEMPLATEHANDLE)) && !pfr->hInstance)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOHINSTANCE);
+            COMDLG32_SetCommDlgExtendedError(CDERR_NOHINSTANCE);
                 return FALSE;
         }
@@ -338 +339 @@
         if((pfr->Flags & FR_ENABLETEMPLATE) && !pfr->lpTemplateName)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOTEMPLATE);
-                return FALSE;
-        }
-
-        return TRUE;
-}
-
-/***********************************************************************
- *      COMDLG32_FR_DoFindReplace               [internal]
+            COMDLG32_SetCommDlgExtendedError(CDERR_NOTEMPLATE);
+                return FALSE;
+        }
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *  COMDLG32_FR_DoFindReplace       [internal]
  * Actual load and creation of the Find/Replace dialog.
- *      RETURNS
- *              Window handle to created dialog:Success
- *              NULL:Failure
+ *  RETURNS
+ *      Window handle to created dialog:Success
+ *      NULL:Failure
  */
 static HWND COMDLG32_FR_DoFindReplace(
-        COMDLG32_FR_Data *pdata /* [in] Internal data structure */
+    COMDLG32_FR_Data *pdata /* [in] Internal data structure */
 ) {
-        HWND hdlgwnd = 0;
+    HWND hdlgwnd = 0;
         HGLOBAL loadrc;
         DWORD error;
         LPDLGTEMPLATEW rcs;
 
-        TRACE("hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
+    TRACE("hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
 
         if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
         {
-                HMODULE hmod = COMDLG32_hInstance;
-                HRSRC htemplate;
-                if(pdata->fr.Flags & FR_ENABLETEMPLATE)
-                {
-                        hmod = (HMODULE)pdata->fr.hInstance;
+            HMODULE hmod = COMDLG32_hInstance;
+        HRSRC htemplate;
+            if(pdata->fr.Flags & FR_ENABLETEMPLATE)
+            {
+                hmod = (HMODULE)pdata->fr.hInstance;
                         if(pdata->fr.Flags & FR_WINE_UNICODE)
                         {
-                                htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOGA);
+                htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOGA);
                         }
                         else
                         {
-                                htemplate = FindResourceA(hmod, pdata->fr.lpTemplateName, (LPCSTR)RT_DIALOGA);
+                htemplate = FindResourceA(hmod, pdata->fr.lpTemplateName, (LPCSTR)RT_DIALOGA);
                         }
-                }
-                else
-                {
-                        int rcid = pdata->fr.Flags & FR_WINE_REPLACE ? REPLACEDLGORD
-                                                                     : FINDDLGORD;
-                        htemplate = FindResourceA(hmod, MAKEINTRESOURCEA(rcid), (LPCSTR)RT_DIALOGA);
-                }
-                if(!htemplate)
-                {
-                        error = CDERR_FINDRESFAILURE;
-                        goto cleanup;
-                }
-
-                loadrc = LoadResource(hmod, htemplate);
-        }
+            }
         else
-        {
-                loadrc = (HGLOBAL)pdata->fr.hInstance;
+            {
+            int rcid = pdata->fr.Flags & FR_WINE_REPLACE ? REPLACEDLGORD
+                                     : FINDDLGORD;
+            htemplate = FindResourceA(hmod, MAKEINTRESOURCEA(rcid), (LPCSTR)RT_DIALOGA);
+        }
+        if(!htemplate)
+                {
+                    error = CDERR_FINDRESFAILURE;
+                        goto cleanup;
+                }
+
+            loadrc = LoadResource(hmod, htemplate);
+        }
+        else
+        {
+            loadrc = (HGLOBAL)pdata->fr.hInstance;
         }
 
         if(!loadrc)
         {
-                error = CDERR_LOADRESFAILURE;
-                goto cleanup;
-        }
+        error = CDERR_LOADRESFAILURE;
+        goto cleanup;
+    }
 
         if((rcs = (LPDLGTEMPLATEW)LockResource(loadrc)) == NULL)
         {
-                error = CDERR_LOCKRESFAILURE;
-                goto cleanup;
+        error = CDERR_LOCKRESFAILURE;
+        goto cleanup;
         }
 
         hdlgwnd = CreateDialogIndirectParamA(COMDLG32_hInstance,
-                                             rcs,
+                             rcs,
                                              pdata->fr.hwndOwner,
                                              (DLGPROC)COMDLG32_FindReplaceDlgProc,
                                              (LPARAM)pdata);
-        if(!hdlgwnd)
-        {
-                error = CDERR_DIALOGFAILURE;
+    if(!hdlgwnd)
+        {
+            error = CDERR_DIALOGFAILURE;
 cleanup:
-                COMDLG32_SetCommDlgExtendedError(error);
+            COMDLG32_SetCommDlgExtendedError(error);
                 HeapFree(GetProcessHeap(), 0, pdata);
         }
@@ -425 +426 @@
 
 /***********************************************************************
- *      FindTextA                               [COMDLG32.6]
- *      RETURNS
- *              Window handle to created dialog: Success
- *              NULL: Failure
+ *  FindTextA               [COMDLG32.6]
+ *  RETURNS
+ *      Window handle to created dialog: Success
+ *      NULL: Failure
  */
 HWND WINAPI FindTextA(
-        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
+    LPFINDREPLACEA pfr  /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+    COMDLG32_FR_Data *pdata;
 
         TRACE("LPFINDREPLACE=%p\n", pfr);
 
-        if(!COMDLG32_FR_CheckPartial(pfr, FALSE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
-                return 0; /* Error has been set */
+    if(!COMDLG32_FR_CheckPartial(pfr, FALSE))
+            return 0;
+
+    if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
+            return 0; /* Error has been set */
 
         pdata->user_fr.fra = pfr;
         pdata->fr = *pfr;
-        return COMDLG32_FR_DoFindReplace(pdata);
-}
-
-/***********************************************************************
- *      ReplaceTextA                            [COMDLG32.19]
- *      RETURNS
- *              Window handle to created dialog: Success
- *              NULL: Failure
+    return COMDLG32_FR_DoFindReplace(pdata);
+}
+
+/***********************************************************************
+ *  ReplaceTextA                [COMDLG32.19]
+ *  RETURNS
+ *      Window handle to created dialog: Success
+ *      NULL: Failure
  */
 HWND WINAPI ReplaceTextA(
-        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
+    LPFINDREPLACEA pfr  /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+    COMDLG32_FR_Data *pdata;
 
         TRACE("LPFINDREPLACE=%p\n", pfr);
 
-        if(!COMDLG32_FR_CheckPartial(pfr, TRUE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
-                return 0; /* Error has been set */
+    if(!COMDLG32_FR_CheckPartial(pfr, TRUE))
+            return 0;
+
+    if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
+            return 0; /* Error has been set */
 
         pdata->user_fr.fra = pfr;
         pdata->fr = *pfr;
-        pdata->fr.Flags |= FR_WINE_REPLACE;
-        return COMDLG32_FR_DoFindReplace(pdata);
-}
-
-/***********************************************************************
- *      FindTextW                               [COMDLG32.7]
- *      RETURNS
- *              Window handle to created dialog: Success
- *              NULL: Failure
+    pdata->fr.Flags |= FR_WINE_REPLACE;
+    return COMDLG32_FR_DoFindReplace(pdata);
+}
+
+/***********************************************************************
+ *  FindTextW               [COMDLG32.7]
+ *  RETURNS
+ *      Window handle to created dialog: Success
+ *      NULL: Failure
  */
 HWND WINAPI FindTextW(
-        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
+    LPFINDREPLACEW pfr  /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+    COMDLG32_FR_Data *pdata;
         DWORD len;
 
         TRACE("LPFINDREPLACE=%p\n", pfr);
 
-        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
-                return 0;
+    if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
+            return 0;
 
         len = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrFindWhat, pfr->wFindWhatLen,
@@ -496 +497 @@
 
         pdata->user_fr.frw = pfr;
-        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
-        pdata->fr.Flags |= FR_WINE_UNICODE;
+        pdata->fr = *(LPFINDREPLACEA)pfr;   /* FINDREPLACEx have same size */
+    pdata->fr.Flags |= FR_WINE_UNICODE;
         pdata->fr.lpstrFindWhat = (LPSTR)(pdata + 1);  /* Set string pointer */
         WideCharToMultiByte( CP_ACP, 0, pfr->lpstrFindWhat, pfr->wFindWhatLen,
@@ -505 +506 @@
 
 /***********************************************************************
- *      ReplaceTextW                            [COMDLG32.20]
- *      RETURNS
- *              Window handle to created dialog: Success
- *              NULL: Failure
+ *  ReplaceTextW                [COMDLG32.20]
+ *  RETURNS
+ *      Window handle to created dialog: Success
+ *      NULL: Failure
  */
 HWND WINAPI ReplaceTextW(
-        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
+    LPFINDREPLACEW pfr  /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+    COMDLG32_FR_Data *pdata;
         DWORD len1, len2;
 
         TRACE("LPFINDREPLACE=%p\n", pfr);
 
-        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
-                return 0;
+    if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
+            return 0;
 
         len1 = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrFindWhat, pfr->wFindWhatLen,
@@ -525 +526 @@
         len2 = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrReplaceWith, pfr->wReplaceWithLen,
                                     NULL, 0, NULL, NULL );
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
+    if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
                                                           + len1 + len2)) == NULL)
             return 0; /* Error has been set */
 
         pdata->user_fr.frw = pfr;
-        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
-        pdata->fr.Flags |= FR_WINE_REPLACE | FR_WINE_UNICODE;
+        pdata->fr = *(LPFINDREPLACEA)pfr;   /* FINDREPLACEx have same size */
+    pdata->fr.Flags |= FR_WINE_REPLACE | FR_WINE_UNICODE;
         pdata->fr.lpstrFindWhat = (LPSTR)(pdata + 1);  /* Set string pointer */
         pdata->fr.lpstrReplaceWith = pdata->fr.lpstrFindWhat + len1;

trunk/src/comdlg32/fontdlg.c

@@ +1 @@
+/* $Id: fontdlg.c,v 1.4 2001-09-05 12:12:02 bird Exp $ */
 /*
  * COMMDLG - Font Dialog
@@ -45 +46 @@
 
 #ifdef __WIN32OS2__
-static HBITMAP hBitmapTT = 0; 
+static HBITMAP hBitmapTT = 0;
 #else
-static HBITMAP16 hBitmapTT = 0; 
+static HBITMAP16 hBitmapTT = 0;
 #endif
 
 LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
-                                  LPARAM lParam);
+                  LPARAM lParam);
 LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
-                                  LPARAM lParam);
+                  LPARAM lParam);
 
 #ifndef __WIN32OS2__
@@ -79 +80 @@
 
 /***********************************************************************
- *                        ChooseFont16   (COMMDLG.15)     
+ *                        ChooseFont16   (COMMDLG.15)
  */
 BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
@@ -92 +93 @@
     LOGFONTA lf32a;
     SEGPTR lpTemplateName;
-    
+
     cf32a.lpLogFont=&lf32a;
     CFn_CHOOSEFONT16to32A(lpChFont, &cf32a);
 
     TRACE("ChooseFont\n");
-    if (!lpChFont) return FALSE;    
+    if (!lpChFont) return FALSE;
 
     if (lpChFont->Flags & CF_ENABLETEMPLATEHANDLE)
@@ -157 +158 @@
         }
         ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
-        hDlgTmpl16 = hGlobal16;         
+        hDlgTmpl16 = hGlobal16;
 
     }
@@ -204 +205 @@
   if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
     CF_ENABLETEMPLATEHANDLE)) FIXME(": unimplemented flag (ignored)\n");
-  return DialogBoxIndirectParamA(COMMDLG_hInstance32, template, 
+  return DialogBoxIndirectParamA(COMMDLG_hInstance32, template,
             lpChFont->hwndOwner, (DLGPROC)FormatCharDlgProcA, (LPARAM)lpChFont );
 }
@@ -239 +240 @@
   cf32a.lpszStyle=HEAP_strdupWtoA(GetProcessHeap(), 0, lpChFont->lpszStyle);
   lpChFont->lpTemplateName=(LPWSTR)&cf32a;
-  bRet = DialogBoxIndirectParamW(COMMDLG_hInstance32, template, 
+  bRet = DialogBoxIndirectParamW(COMMDLG_hInstance32, template,
             lpChFont->hwndOwner, (DLGPROC)FormatCharDlgProcW, (LPARAM)lpChFont );
   HeapFree(GetProcessHeap(), 0, cf32a.lpszStyle);
@@ -288 +289 @@
  *              AddFontFamily                               [internal]
  */
-static INT AddFontFamily(LPLOGFONTA lplf, UINT nFontType, 
+static INT AddFontFamily(LPLOGFONTA lplf, UINT nFontType,
                            LPCHOOSEFONTA lpcf, HWND hwnd)
 {
@@ -304 +305 @@
   if (lpcf->Flags & CF_TTONLY)
    if (!(nFontType & TRUETYPE_FONTTYPE))
-     return 1;   
+     return 1;
 
   i=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName);
@@ -327 +328 @@
  *              FontFamilyEnumProc32                           [internal]
  */
-static INT WINAPI FontFamilyEnumProc(LPENUMLOGFONTA lpEnumLogFont, 
-          LPNEWTEXTMETRICA metrics, UINT nFontType, LPARAM lParam)
+static INT WINAPI FontFamilyEnumProc(LPENUMLOGFONTA lpEnumLogFont,
+      LPNEWTEXTMETRICA metrics, UINT nFontType, LPARAM lParam)
 {
   LPCFn_ENUMSTRUCT e;
@@ -344 +345 @@
   HWND16 hwnd=LOWORD(lParam);
   HWND hDlg=GetParent(hwnd);
-  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER); 
+  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
   LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN( logfont );
   LOGFONTA lf32a;
@@ -362 +363 @@
    #define FSTYLES 4
    struct FONTSTYLE
-          { int italic; 
+          { int italic;
             int weight;
             char stname[20]; };
-   static struct FONTSTYLE fontstyles[FSTYLES]={ 
+   static struct FONTSTYLE fontstyles[FSTYLES]={
           { 0,FW_NORMAL,"Regular"},{0,FW_BOLD,"Bold"},
           { 1,FW_NORMAL,"Italic"}, {1,FW_BOLD,"Bold Italic"}};
@@ -389 +390 @@
        j=SendMessageA(hwnd,CB_ADDSTRING,0,(LPARAM)str );
        if (j==CB_ERR) return 1;
-       j=SendMessageA(hwnd, CB_SETITEMDATA, j, 
+       j=SendMessageA(hwnd, CB_SETITEMDATA, j,
                                  MAKELONG(fontstyles[i].weight,fontstyles[i].italic));
 #else
@@ -396 +397 @@
        SEGPTR_FREE(str);
        if (j==CB_ERR) return 1;
-       j=SendMessage16(hwnd, CB_SETITEMDATA16, j, 
+       j=SendMessage16(hwnd, CB_SETITEMDATA16, j,
                                  MAKELONG(fontstyles[i].weight,fontstyles[i].italic));
 #endif
-       if (j==CB_ERR) return 1;                                 
+       if (j==CB_ERR) return 1;
      }
-   }  
+   }
   return 0;
 }
@@ -417 +418 @@
     {
         sprintf(buffer, "%2d", h);
-        j=SendMessageA(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer);
-        if (j==CB_ERR)
-        {
-            j=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer);      
-            if (j!=CB_ERR) j = SendMessageA(hwnd, CB_SETITEMDATA, j, h); 
-            if (j==CB_ERR) return 1;
-        }
+    j=SendMessageA(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer);
+    if (j==CB_ERR)
+    {
+            j=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer);
+            if (j!=CB_ERR) j = SendMessageA(hwnd, CB_SETITEMDATA, j, h);
+            if (j==CB_ERR) return 1;
+    }
     }
     return 0;
-} 
- 
+}
+
 /*************************************************************************
  *              SetFontSizesToCombo3                           [internal]
@@ -444 +445 @@
  *                 AddFontStyle                          [internal]
  */
-static INT AddFontStyle(LPLOGFONTA lplf, UINT nFontType, 
+static INT AddFontStyle(LPLOGFONTA lplf, UINT nFontType,
     LPCHOOSEFONTA lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg)
 {
   int i;
-  
+
   TRACE("(nFontType=%d)\n",nFontType);
   TRACE("  %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
-               " ch=%d op=%d cp=%d q=%d pf=%xh\n",
-               lplf->lfFaceName,lplf->lfHeight,lplf->lfWidth,
-               lplf->lfEscapement,lplf->lfOrientation,
-               lplf->lfWeight,lplf->lfItalic,lplf->lfUnderline,
-               lplf->lfStrikeOut,lplf->lfCharSet, lplf->lfOutPrecision,
-               lplf->lfClipPrecision,lplf->lfQuality, lplf->lfPitchAndFamily);
+           " ch=%d op=%d cp=%d q=%d pf=%xh\n",
+           lplf->lfFaceName,lplf->lfHeight,lplf->lfWidth,
+           lplf->lfEscapement,lplf->lfOrientation,
+           lplf->lfWeight,lplf->lfItalic,lplf->lfUnderline,
+           lplf->lfStrikeOut,lplf->lfCharSet, lplf->lfOutPrecision,
+           lplf->lfClipPrecision,lplf->lfQuality, lplf->lfPitchAndFamily);
   if (nFontType & RASTER_FONTTYPE)
   {
@@ -473 +474 @@
   return 1 ;
 
-}    
+}
 
 #ifndef __WIN32OS2__
@@ -485 +486 @@
   HWND16 hcmb3=HIWORD(lParam);
   HWND hDlg=GetParent(hcmb3);
-  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER); 
+  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
   LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN(logfont);
   LOGFONTA lf32a;
@@ -497 +498 @@
  *                 FontStyleEnumProc32                     [internal]
  */
-static INT WINAPI FontStyleEnumProc( LPENUMLOGFONTA lpFont, 
+static INT WINAPI FontStyleEnumProc( LPENUMLOGFONTA lpFont,
           LPNEWTEXTMETRICA metrics, UINT nFontType, LPARAM lParam )
 {
@@ -520 +521 @@
   HCURSOR hcursor=SetCursor(LoadCursorA(0,IDC_WAITA));
 
-  SetWindowLongA(hDlg, DWL_USER, lParam); 
+  SetWindowLongA(hDlg, DWL_USER, lParam);
   lpxx=lpcf->lpLogFont;
   TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
@@ -527 +528 @@
   {
     ERR("structure size failure !!!\n");
-    EndDialog (hDlg, 0); 
+    EndDialog (hDlg, 0);
     return FALSE;
   }
@@ -536 +537 @@
   SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,
      CreateFontA(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
-                         
+
   if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner))
     ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE);
@@ -582 +583 @@
       {
         SendDlgItemMessageA(hDlg, cmb1, CB_SETCURSEL, j, 0);
-        SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
+    SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
                        GetDlgItem(hDlg,cmb1));
         init=1;
@@ -592 +593 @@
             SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
         }
-      
+
         /* look for fitting font size in combobox3 */
         j=SendDlgItemMessageA(hDlg, cmb3, CB_GETCOUNT, 0, 0);
@@ -607 +608 @@
       SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
                        GetDlgItem(hDlg,cmb1));
-    }    
+    }
     if (lpcf->Flags & CF_USESTYLE && lpcf->lpszStyle)
     {
@@ -622 +623 @@
   {
     WARN("HDC failure !!!\n");
-    EndDialog (hDlg, 0); 
+    EndDialog (hDlg, 0);
     return FALSE;
   }
@@ -628 +629 @@
   if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
     ReleaseDC(hDlg,hdc);
-  SetCursor(hcursor);   
+  SetCursor(hcursor);
   return TRUE;
 }
@@ -659 +660 @@
   COLORREF cr, oldText=0, oldBk=0;
   RECT rect;
-#if 0  
+#if 0
   HDC hMemDC;
   int nFontType;
   HBITMAP hBitmap; /* for later TT usage */
-#endif  
+#endif
   LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam;
 
-  if (lpdi->itemID == 0xFFFF)                   /* got no items */
+  if (lpdi->itemID == 0xFFFF)           /* got no items */
     DrawFocusRect(lpdi->hDC, &lpdi->rcItem);
   else
@@ -685 +686 @@
    }
    else
-     return TRUE;       /* this should never happen */
+     return TRUE;   /* this should never happen */
 
    rect=lpdi->rcItem;
    switch (lpdi->CtlID)
    {
-    case cmb1:  /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */
-                SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
-                               (LPARAM)buffer);           
-                GetObjectA( hBitmapTT, sizeof(bm), &bm );
-                TextOutA(lpdi->hDC, lpdi->rcItem.left + bm.bmWidth + 10,
+    case cmb1:  /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */
+        SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
+                   (LPARAM)buffer);
+        GetObjectA( hBitmapTT, sizeof(bm), &bm );
+        TextOutA(lpdi->hDC, lpdi->rcItem.left + bm.bmWidth + 10,
                            lpdi->rcItem.top, buffer, strlen(buffer));
 #if 0
-                nFontType = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
-                  /* FIXME: draw bitmap if truetype usage */
-                if (nFontType&TRUETYPE_FONTTYPE)
-                {
-                  hMemDC = CreateCompatibleDC(lpdi->hDC);
-                  hBitmap = SelectObject(hMemDC, hBitmapTT);
-                  BitBlt(lpdi->hDC, lpdi->rcItem.left, lpdi->rcItem.top,
+        nFontType = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
+          /* FIXME: draw bitmap if truetype usage */
+        if (nFontType&TRUETYPE_FONTTYPE)
+        {
+          hMemDC = CreateCompatibleDC(lpdi->hDC);
+          hBitmap = SelectObject(hMemDC, hBitmapTT);
+          BitBlt(lpdi->hDC, lpdi->rcItem.left, lpdi->rcItem.top,
                            bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY);
-                  SelectObject(hMemDC, hBitmap);
-                  DeleteDC(hMemDC);
-                }
+          SelectObject(hMemDC, hBitmap);
+          DeleteDC(hMemDC);
+        }
 #endif
-                break;
+        break;
     case cmb2:
-    case cmb3:  /* TRACE(commdlg,"WM_DRAWITEN cmb2,cmb3\n"); */
-                SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
-                               (LPARAM)buffer);
-                TextOutA(lpdi->hDC, lpdi->rcItem.left,
+    case cmb3:  /* TRACE(commdlg,"WM_DRAWITEN cmb2,cmb3\n"); */
+        SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
+                       (LPARAM)buffer);
+        TextOutA(lpdi->hDC, lpdi->rcItem.left,
                            lpdi->rcItem.top, buffer, strlen(buffer));
-                break;
-
-    case cmb4:  /* TRACE(commdlg,"WM_DRAWITEM cmb4 (=COLOR)\n"); */
-                SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
-                               (LPARAM)buffer);
-                TextOutA(lpdi->hDC, lpdi->rcItem.left +  25+5,
+        break;
+
+    case cmb4:  /* TRACE(commdlg,"WM_DRAWITEM cmb4 (=COLOR)\n"); */
+        SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
+                           (LPARAM)buffer);
+        TextOutA(lpdi->hDC, lpdi->rcItem.left +  25+5,
                            lpdi->rcItem.top, buffer, strlen(buffer));
-                cr = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
-                hBrush = CreateSolidBrush(cr);
-                if (hBrush)
-                {
-                  hBrush = SelectObject (lpdi->hDC, hBrush) ;
-                  rect.right=rect.left+25;
-                  rect.top++;
-                  rect.left+=5;
-                  rect.bottom--;
-                  Rectangle( lpdi->hDC, rect.left, rect.top,
+        cr = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
+        hBrush = CreateSolidBrush(cr);
+        if (hBrush)
+        {
+          hBrush = SelectObject (lpdi->hDC, hBrush) ;
+          rect.right=rect.left+25;
+          rect.top++;
+          rect.left+=5;
+          rect.bottom--;
+          Rectangle( lpdi->hDC, rect.left, rect.top,
                                rect.right, rect.bottom );
-                  DeleteObject( SelectObject (lpdi->hDC, hBrush)) ;
-                }
-                rect=lpdi->rcItem;
-                rect.left+=25+5;
-                break;
-
-    default:    return TRUE;    /* this should never happen */
+          DeleteObject( SelectObject (lpdi->hDC, hBrush)) ;
+        }
+        rect=lpdi->rcItem;
+        rect.left+=25+5;
+        break;
+
+    default:    return TRUE;    /* this should never happen */
    }
    if (lpdi->itemState == ODS_SELECTED)
@@ -777 +778 @@
   HDC hdc;
   LPLOGFONTA lpxx=lpcf->lpLogFont;
-  
+
   TRACE("WM_COMMAND wParam=%08lX lParam=%08lX\n", (LONG)wParam, lParam);
   switch (LOWORD(wParam))
   {
-        case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
-                  {
-                    hdc=(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
-                    if (hdc)
-                    {
+    case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
+          {
+            hdc=(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
+            if (hdc)
+            {
 #ifdef __WIN32OS2__
-                      SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT, 0, 0); 
-                      SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT, 0, 0);
-                      i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0);
+                      SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT, 0, 0);
+              SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT, 0, 0);
+              i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0);
 #else
-                      SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0); 
-                      SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT16, 0, 0);
-                      i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL16, 0, 0);
+                      SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0);
+              SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT16, 0, 0);
+              i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL16, 0, 0);
 #endif
-                      if (i!=CB_ERR)
-                      {
-                        HCURSOR hcursor=SetCursor(LoadCursorA(0,IDC_WAITA));
-                        CFn_ENUMSTRUCT s;
+              if (i!=CB_ERR)
+              {
+                HCURSOR hcursor=SetCursor(LoadCursorA(0,IDC_WAITA));
+            CFn_ENUMSTRUCT s;
                         char str[256];
                         SendDlgItemMessageA(hDlg, cmb1, CB_GETLBTEXT, i,
                                               (LPARAM)str);
-                        TRACE("WM_COMMAND/cmb1 =>%s\n",str);
-                        s.hWnd1=GetDlgItem(hDlg, cmb2);
-                        s.hWnd2=GetDlgItem(hDlg, cmb3);
-                        s.lpcf32a=lpcf;
-                        EnumFontFamiliesA(hdc, str, FontStyleEnumProc, (LPARAM)&s);
-                        SetCursor(hcursor);
-                      }
-                      if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
-                        ReleaseDC(hDlg,hdc);
-                    }
-                    else
+                    TRACE("WM_COMMAND/cmb1 =>%s\n",str);
+            s.hWnd1=GetDlgItem(hDlg, cmb2);
+            s.hWnd2=GetDlgItem(hDlg, cmb3);
+            s.lpcf32a=lpcf;
+                    EnumFontFamiliesA(hdc, str, FontStyleEnumProc, (LPARAM)&s);
+                SetCursor(hcursor);
+              }
+              if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
+                ReleaseDC(hDlg,hdc);
+            }
+            else
                     {
                       WARN("HDC failure !!!\n");
-                      EndDialog (hDlg, 0); 
+                      EndDialog (hDlg, 0);
                       return TRUE;
                     }
-                  }
-        case chx1:
-        case chx2:
-        case cmb2:
-        case cmb3:if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED )
-                  {
+              }
+    case chx1:
+    case chx2:
+    case cmb2:
+    case cmb3:if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED )
+              {
                     char str[256];
                     TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam);
-                    i=SendDlgItemMessageA(hDlg,cmb1,CB_GETCURSEL,0,0);
-                    if (i==CB_ERR)
+            i=SendDlgItemMessageA(hDlg,cmb1,CB_GETCURSEL,0,0);
+            if (i==CB_ERR)
                       i=GetDlgItemTextA( hDlg, cmb1, str, 256 );
                     else
                     {
-                      SendDlgItemMessageA(hDlg,cmb1,CB_GETLBTEXT,i,
-                                            (LPARAM)str);
-                      l=SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,i,0);
-                      j=HIWORD(l);
-                      lpcf->nFontType = LOWORD(l);
-                      /* FIXME:   lpcf->nFontType |= ....  SIMULATED_FONTTYPE and so */
-                      /* same value reported to the EnumFonts
-                       call back with the extra FONTTYPE_...  bits added */
-                      lpxx->lfPitchAndFamily=j&0xff;
-                      lpxx->lfCharSet=j>>8;
+              SendDlgItemMessageA(hDlg,cmb1,CB_GETLBTEXT,i,
+                                    (LPARAM)str);
+              l=SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,i,0);
+              j=HIWORD(l);
+              lpcf->nFontType = LOWORD(l);
+              /* FIXME:   lpcf->nFontType |= ....  SIMULATED_FONTTYPE and so */
+              /* same value reported to the EnumFonts
+               call back with the extra FONTTYPE_...  bits added */
+              lpxx->lfPitchAndFamily=j&0xff;
+              lpxx->lfCharSet=j>>8;
                     }
                     strcpy(lpxx->lfFaceName,str);
-                    i=SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
-                    if (i!=CB_ERR)
-                    {
-                      l=SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0);
-                      if (0!=(lpxx->lfItalic=HIWORD(l)))
-                        lpcf->nFontType |= ITALIC_FONTTYPE;
-                      if ((lpxx->lfWeight=LOWORD(l)) > FW_MEDIUM)
-                        lpcf->nFontType |= BOLD_FONTTYPE;
-                    }
-                    i=SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
-                    if (i!=CB_ERR)
-                      lpxx->lfHeight=-LOWORD(SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, i, 0));
-                    else
-                      lpxx->lfHeight=0;
-                    lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1);
-                    lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2);
-                    lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0;
-                    lpxx->lfOutPrecision=OUT_DEFAULT_PRECIS;
-                    lpxx->lfClipPrecision=CLIP_DEFAULT_PRECIS;
-                    lpxx->lfQuality=DEFAULT_QUALITY;
+            i=SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+            if (i!=CB_ERR)
+            {
+              l=SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0);
+              if (0!=(lpxx->lfItalic=HIWORD(l)))
+                lpcf->nFontType |= ITALIC_FONTTYPE;
+              if ((lpxx->lfWeight=LOWORD(l)) > FW_MEDIUM)
+                lpcf->nFontType |= BOLD_FONTTYPE;
+            }
+            i=SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+            if (i!=CB_ERR)
+              lpxx->lfHeight=-LOWORD(SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, i, 0));
+            else
+              lpxx->lfHeight=0;
+            lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1);
+            lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2);
+            lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0;
+            lpxx->lfOutPrecision=OUT_DEFAULT_PRECIS;
+            lpxx->lfClipPrecision=CLIP_DEFAULT_PRECIS;
+            lpxx->lfQuality=DEFAULT_QUALITY;
                     lpcf->iPointSize= -10*lpxx->lfHeight;
 
-                    hFont=CreateFontIndirectA(lpxx);
-                    if (hFont)
-                    {
-                      HFONT oldFont=SendDlgItemMessageA(hDlg, stc6, 
-                          WM_GETFONT, 0, 0);
-                      SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,hFont,TRUE);
-                      DeleteObject(oldFont);
-                    }
+            hFont=CreateFontIndirectA(lpxx);
+            if (hFont)
+            {
+              HFONT oldFont=SendDlgItemMessageA(hDlg, stc6,
+                  WM_GETFONT, 0, 0);
+              SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,hFont,TRUE);
+              DeleteObject(oldFont);
+            }
                   }
                   break;
 
-        case cmb4:i=SendDlgItemMessageA(hDlg, cmb4, CB_GETCURSEL, 0, 0);
-                  if (i!=CB_ERR)
-                  {
-                   lpcf->rgbColors=textcolors[i];
-                   InvalidateRect( GetDlgItem(hDlg,stc6), NULL, 0 );
-                  }
-                  break;
-        
-        case psh15:i=RegisterWindowMessageA( HELPMSGSTRINGA );
-                  if (lpcf->hwndOwner)
-                    SendMessageA(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLongA(hDlg, DWL_USER));
-/*                if (CFn_HookCallChk(lpcf))
-                    CallWindowProc16(lpcf->lpfnHook,hDlg,WM_COMMAND,psh15,(LPARAM)lpcf);*/
-                  break;
-
-        case IDOK:if (  (!(lpcf->Flags & CF_LIMITSIZE))  ||
-                     ( (lpcf->Flags & CF_LIMITSIZE) && 
-                      (-lpxx->lfHeight >= lpcf->nSizeMin) && 
+    case cmb4:i=SendDlgItemMessageA(hDlg, cmb4, CB_GETCURSEL, 0, 0);
+          if (i!=CB_ERR)
+          {
+           lpcf->rgbColors=textcolors[i];
+           InvalidateRect( GetDlgItem(hDlg,stc6), NULL, 0 );
+          }
+          break;
+
+    case psh15:i=RegisterWindowMessageA( HELPMSGSTRINGA );
+          if (lpcf->hwndOwner)
+            SendMessageA(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLongA(hDlg, DWL_USER));
+/*        if (CFn_HookCallChk(lpcf))
+            CallWindowProc16(lpcf->lpfnHook,hDlg,WM_COMMAND,psh15,(LPARAM)lpcf);*/
+          break;
+
+    case IDOK:if (  (!(lpcf->Flags & CF_LIMITSIZE))  ||
+                     ( (lpcf->Flags & CF_LIMITSIZE) &&
+                      (-lpxx->lfHeight >= lpcf->nSizeMin) &&
                       (-lpxx->lfHeight <= lpcf->nSizeMax)))
-                     EndDialog(hDlg, TRUE);
-                  else
-                  {
+                 EndDialog(hDlg, TRUE);
+              else
+              {
                    char buffer[80];
-                   sprintf(buffer,"Select a font size between %d and %d points.",
+               sprintf(buffer,"Select a font size between %d and %d points.",
                            lpcf->nSizeMin,lpcf->nSizeMax);
-                   MessageBoxA(hDlg, buffer, NULL, MB_OK);
-                  } 
-                  return(TRUE);
-        case IDCANCEL:EndDialog(hDlg, FALSE);
-                  return(TRUE);
-        }
+               MessageBoxA(hDlg, buffer, NULL, MB_OK);
+              }
+          return(TRUE);
+    case IDCANCEL:EndDialog(hDlg, FALSE);
+          return(TRUE);
+    }
       return(FALSE);
 }
@@ -930 +931 @@
   UINT uMsg32;
   WPARAM wParam32;
-  LRESULT res=0;  
+  LRESULT res=0;
   if (message!=WM_INITDIALOG)
   {
-   lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);   
+   lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
    if (!lpcf)
       return FALSE;
@@ -945 +946 @@
     lpcf=(LPCHOOSEFONT16)lParam;
     lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
-    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a)) 
+    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a))
     {
       TRACE("CFn_WMInitDialog returned FALSE\n");
       return FALSE;
-    }  
+    }
     if (CFn_HookCallChk(lpcf))
       return CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
@@ -959 +960 @@
       case WM_MEASUREITEM:
                         res=CFn_WMMeasureItem(hDlg, wParam32, lParam);
-                        break;
+            break;
       case WM_DRAWITEM:
                         res=CFn_WMDrawItem(hDlg, wParam32, lParam);
-                        break;
+            break;
       case WM_CTLCOLORSTATIC:
                         res=CFn_WMCtlColorStatic(hDlg, wParam32, lParam, lpcf32a);
-                        break;
+            break;
       case WM_COMMAND:
                         res=CFn_WMCommand(hDlg, wParam32, lParam, lpcf32a);
-                        break;
+            break;
       case WM_DESTROY:
                         res=CFn_WMDestroy(hDlg, wParam32, lParam);
-                        break;
-      case WM_CHOOSEFONT_GETLOGFONT: 
+            break;
+      case WM_CHOOSEFONT_GETLOGFONT:
                          TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
-                                      lParam);
-                         FIXME("current logfont back to caller\n");
+                      lParam);
+             FIXME("current logfont back to caller\n");
                         break;
     }
-  WINPROC_UnmapMsg16To32A(hDlg,uMsg32, wParam32, lParam, res);    
+  WINPROC_UnmapMsg16To32A(hDlg,uMsg32, wParam32, lParam, res);
   return res;
 }
@@ -993 +994 @@
   if (uMsg!=WM_INITDIALOG)
   {
-   lpcf=(LPCHOOSEFONTA)GetWindowLongA(hDlg, DWL_USER);   
+   lpcf=(LPCHOOSEFONTA)GetWindowLongA(hDlg, DWL_USER);
    if (!lpcf)
      return FALSE;
@@ -1004 +1005 @@
   {
     lpcf=(LPCHOOSEFONTA)lParam;
-    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf)) 
+    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf))
     {
       TRACE("CFn_WMInitDialog returned FALSE\n");
       return FALSE;
-    }  
+    }
     if (CFn_HookCallChk32(lpcf))
       return CallWindowProcA((WNDPROC)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
@@ -1026 +1027 @@
       case WM_CHOOSEFONT_GETLOGFONT:
                          TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
-                                      lParam);
-                         FIXME("current logfont back to caller\n");
+                      lParam);
+             FIXME("current logfont back to caller\n");
                         break;
     }
@@ -1044 +1045 @@
   if (uMsg!=WM_INITDIALOG)
   {
-   lpcf32w=(LPCHOOSEFONTW)GetWindowLongA(hDlg, DWL_USER);   
+   lpcf32w=(LPCHOOSEFONTW)GetWindowLongA(hDlg, DWL_USER);
    if (!lpcf32w)
      return FALSE;
@@ -1056 +1057 @@
     lpcf32w=(LPCHOOSEFONTW)lParam;
     lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName;
-    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a)) 
+    if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a))
     {
       TRACE("CFn_WMInitDialog returned FALSE\n");
       return FALSE;
-    }  
+    }
     if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
       return CallWindowProcW((WNDPROC)lpcf32w->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
@@ -1077 +1078 @@
       case WM_DESTROY:
                         return CFn_WMDestroy(hDlg, wParam, lParam);
-      case WM_CHOOSEFONT_GETLOGFONT: 
+      case WM_CHOOSEFONT_GETLOGFONT:
                          TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
-                                      lParam);
-                         FIXME("current logfont back to caller\n");
+                      lParam);
+             FIXME("current logfont back to caller\n");
                         break;
     }

trunk/src/comdlg32/initcomdlg32.cpp

@@ +1 @@
+/* $Id: initcomdlg32.cpp,v 1.3 2001-09-05 12:12:02 bird Exp $ */
 /*
  * DLL entry point
@@ -54 +55 @@
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-        return COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
+    return COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_PROCESS_DETACH:
-        COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
-        return TRUE;
+    COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
+    return TRUE;
    }
    return FALSE;
@@ -83 +84 @@
    switch (ulFlag) {
       case 0 :
-         dllHandle = RegisterLxDll(hModule, LibMainComdlg32, (PVOID)&comdlg32_PEResTab,
+     dllHandle = RegisterLxDll(hModule, LibMainComdlg32, (PVOID)&comdlg32_PEResTab,
                                    COMDLG32_MAJORIMAGE_VERSION, COMDLG32_MINORIMAGE_VERSION,
                                    IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if(dllHandle == 0) 
-                return 0UL;
+         if(dllHandle == 0)
+        return 0UL;
 
          break;
       case 1 :
          if(dllHandle) {
-                UnregisterLxDll(dllHandle);
+        UnregisterLxDll(dllHandle);
          }
          break;

trunk/src/comdlg32/initterm.cpp

@@ +1 @@
+/* $Id: initterm.cpp,v 1.14 2001-09-05 12:12:02 bird Exp $ */
 /*
  * DLL entry point
@@ -66 +67 @@
       case 1 :
          inittermComdlg32(hModule, ulFlag);
-         ctordtorTerm();
+     ctordtorTerm();
          break;
 

trunk/src/comdlg32/printdlg.c

@@ +1 @@
+/* $Id: printdlg.c,v 1.2 2001-09-05 12:12:02 bird Exp $ */
 /*
  * COMMDLG - Print Dialog
@@ -30 +31 @@
 /* This PRINTDLGA internal structure stores
  * pointers to several throughout useful structures.
- * 
- */
-typedef struct  
+ *
+ */
+typedef struct
 {
   LPDEVMODEA        lpDevMode;
   struct {
       LPPRINTDLGA       lpPrintDlg;
-      LPPRINTDLG16      lpPrintDlg16;
+      LPPRINTDLG16  lpPrintDlg16;
   } dlg;
   LPPRINTER_INFO_2A lpPrinterInfo;
@@ -108 +109 @@
  *
  * Returns the default printer name in buf.
- * Even under WinNT/2000 default printer is retrieved via GetProfileString - 
+ * Even under WinNT/2000 default printer is retrieved via GetProfileString -
  * these entries are mapped somewhere in the registry rather than win.ini.
  *
@@ -118 +119 @@
 
     if(!GetProfileStringA("windows", "device", "", buf, len)) {
-        TRACE("No profile entry for default printer found.\n");
-        return FALSE;
+    TRACE("No profile entry for default printer found.\n");
+    return FALSE;
     }
     if((ptr = strchr(buf, ',')) == NULL) {
-        FIXME("bad format for default printer (%s)!\n",buf);
-        return FALSE;
+    FIXME("bad format for default printer (%s)!\n",buf);
+    return FALSE;
     }
     *ptr = '\0';
@@ -145 +146 @@
     res = OpenPrinterA(buf, hprn, NULL);
     if (!res)
-        FIXME("Could not open printer %s?!\n",buf);
+    FIXME("Could not open printer %s?!\n",buf);
     return res;
 }
@@ -169 +170 @@
     EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num);
     pi = HeapAlloc(GetProcessHeap(), 0, needed);
-    EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)pi, needed, &needed, 
-                  &num);
+    EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)pi, needed, &needed,
+          &num);
 
     for(i = 0; i < num; i++) {
         SendDlgItemMessageA(hDlg, id, CB_ADDSTRING, 0,
-                            (LPARAM)pi[i].pPrinterName );
+                (LPARAM)pi[i].pPrinterName );
     }
     HeapFree(GetProcessHeap(), 0, pi);
     if(!name ||
        (i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1,
-                                (LPARAM)name)) == CB_ERR) {
+                (LPARAM)name)) == CB_ERR) {
 
         char buf[260];
         FIXME("Can't find '%s' in printer list so trying to find default\n",
-              name);
-        if(!PRINTDLG_GetDefaultPrinterName(buf, sizeof(buf)))
-            return num;
-        i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
-        if(i == CB_ERR)
-            FIXME("Can't find default printer in printer list\n");
+          name);
+    if(!PRINTDLG_GetDefaultPrinterName(buf, sizeof(buf)))
+        return num;
+    i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
+    if(i == CB_ERR)
+        FIXME("Can't find default printer in printer list\n");
     }
     SendDlgItemMessageA(hDlg, id, CB_SETCURSEL, i, 0);
@@ -202 +203 @@
  *  (NB. when we handle unicode the offsets will be in wchars).
  */
-static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, char* DeviceDriverName, 
-                                    char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, char* DeviceDriverName,
+                    char* DeviceName, char* OutputPort)
 {
     long size;
@@ -215 +216 @@
             + strlen(OutputPort) + 1
             + sizeof(DEVNAMES);
-            
+
     if(*hmem)
         *hmem = GlobalReAlloc(*hmem, size, GMEM_MOVEABLE);
@@ -233 +234 @@
     strcpy(pTempPtr, DeviceName);
     lpDevNames->wDeviceOffset = pTempPtr - pDevNamesSpace;
-        
+
     pTempPtr += strlen(DeviceName) + 1;
     strcpy(pTempPtr, OutputPort);
@@ -244 +245 @@
 }
 #ifndef __WIN32OS2__
-static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName, 
-                                      char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName,
+                      char* DeviceName, char* OutputPort)
 {
     long size;
@@ -257 +258 @@
             + strlen(OutputPort) + 1
             + sizeof(DEVNAMES);
-            
+
     if(*hmem)
         *hmem = GlobalReAlloc16(*hmem, size, GMEM_MOVEABLE);
@@ -275 +276 @@
     strcpy(pTempPtr, DeviceName);
     lpDevNames->wDeviceOffset = pTempPtr - pDevNamesSpace;
-        
+
     pTempPtr += strlen(DeviceName) + 1;
     strcpy(pTempPtr, OutputPort);
@@ -292 +293 @@
  *
  *   updates the PrintDlg structure for returnvalues.
- *      
+ *
  * RETURNS
  *   FALSE if user is not allowed to close (i.e. wrong nTo or nFrom values)
  *   TRUE  if succesful.
  */
-static BOOL PRINTDLG_UpdatePrintDlg(HWND hDlg, 
-                                    PRINT_PTRA* PrintStructures)
+static BOOL PRINTDLG_UpdatePrintDlg(HWND hDlg,
+                    PRINT_PTRA* PrintStructures)
 {
     LPPRINTDLGA       lppd = PrintStructures->dlg.lpPrintDlg;
@@ -306 +307 @@
 
     if(!lpdm) {
-        FIXME("No lpdm ptr?\n");
-        return FALSE;
+    FIXME("No lpdm ptr?\n");
+    return FALSE;
     }
 
@@ -313 +314 @@
     if(!(lppd->Flags & PD_PRINTSETUP)) {
         /* check whether nFromPage and nToPage are within range defined by
-         * nMinPage and nMaxPage
-         */
+     * nMinPage and nMaxPage
+     */
         if (IsDlgButtonChecked(hDlg, rad3) == BST_CHECKED) { /* Pages */
-            WORD nToPage;
-            WORD nFromPage;
-            nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
-            nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
-            if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
-                nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
-                char resourcestr[256];
-                char resultstr[256];
-                LoadStringA(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE, 
-                            resourcestr, 255);
-                sprintf(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage);
-                LoadStringA(COMDLG32_hInstance, PD32_PRINT_TITLE, 
-                            resourcestr, 255);
-                MessageBoxA(hDlg, resultstr, resourcestr,
-                            MB_OK | MB_ICONWARNING);
-                return FALSE;
-            }
-            lppd->nFromPage = nFromPage;
-            lppd->nToPage   = nToPage;
-        }
-
-        if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */
-            lppd->Flags |= PD_PRINTTOFILE;
-            pi->pPortName = "FILE:";
-        }
-
-        if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) { /* Collate */
-            FIXME("Collate lppd not yet implemented as output\n");
-        }
-
-        /* set PD_Collate and nCopies */
-        if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
-          /*  The application doesn't support multiple copies or collate...
-           */
-            lppd->Flags &= ~PD_COLLATE;
-            lppd->nCopies = 1;
-          /* if the printer driver supports it... store info there
-           * otherwise no collate & multiple copies !
-           */
-            if (lpdm->dmFields & DM_COLLATE)
-                lpdm->dmCollate = 
-                  (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
-            if (lpdm->dmFields & DM_COPIES)
-                lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
-        } else {
-            if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
-                lppd->Flags |= PD_COLLATE;
+        WORD nToPage;
+        WORD nFromPage;
+        nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
+        nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
+        if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
+        nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
+            char resourcestr[256];
+        char resultstr[256];
+        LoadStringA(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE,
+                resourcestr, 255);
+        sprintf(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage);
+        LoadStringA(COMDLG32_hInstance, PD32_PRINT_TITLE,
+                resourcestr, 255);
+        MessageBoxA(hDlg, resultstr, resourcestr,
+                MB_OK | MB_ICONWARNING);
+        return FALSE;
+        }
+        lppd->nFromPage = nFromPage;
+        lppd->nToPage   = nToPage;
+    }
+
+    if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */
+        lppd->Flags |= PD_PRINTTOFILE;
+        pi->pPortName = "FILE:";
+    }
+
+    if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) { /* Collate */
+        FIXME("Collate lppd not yet implemented as output\n");
+    }
+
+    /* set PD_Collate and nCopies */
+    if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
+      /*  The application doesn't support multiple copies or collate...
+       */
+        lppd->Flags &= ~PD_COLLATE;
+        lppd->nCopies = 1;
+      /* if the printer driver supports it... store info there
+       * otherwise no collate & multiple copies !
+       */
+        if (lpdm->dmFields & DM_COLLATE)
+            lpdm->dmCollate =
+          (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
+        if (lpdm->dmFields & DM_COPIES)
+            lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+    } else {
+        if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
+            lppd->Flags |= PD_COLLATE;
             else
                lppd->Flags &= ~PD_COLLATE;
             lppd->nCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
-        }
+    }
     }
     return TRUE;
@@ -372 +373 @@
 
 static BOOL PRINTDLG_PaperSize(
-        PRINTDLGA       *pdlga,const char *PaperSize,LPPOINT size
+    PRINTDLGA   *pdlga,const char *PaperSize,LPPOINT size
 ) {
-    DEVNAMES    *dn;
-    DEVMODEA    *dm;
-    LPSTR       devname,portname;
-    int         i;
-    DWORD       NrOfEntries,ret;
-    char        *Names = NULL;
-    POINT       *points = NULL;
-    BOOL        retval = FALSE;
-    
+    DEVNAMES    *dn;
+    DEVMODEA    *dm;
+    LPSTR   devname,portname;
+    int     i;
+    DWORD   NrOfEntries,ret;
+    char    *Names = NULL;
+    POINT   *points = NULL;
+    BOOL    retval = FALSE;
+
     dn = GlobalLock(pdlga->hDevNames);
     dm = GlobalLock(pdlga->hDevMode);
-    devname     = ((char*)dn)+dn->wDeviceOffset;
-    portname    = ((char*)dn)+dn->wOutputOffset;
+    devname = ((char*)dn)+dn->wDeviceOffset;
+    portname    = ((char*)dn)+dn->wOutputOffset;
 
 
     NrOfEntries = DeviceCapabilitiesA(devname,portname,DC_PAPERNAMES,NULL,dm);
     if (!NrOfEntries) {
-        FIXME("No papernames found for %s/%s\n",devname,portname);
-        goto out;
+    FIXME("No papernames found for %s/%s\n",devname,portname);
+    goto out;
     }
     Names = (char*)HeapAlloc(GetProcessHeap(),0,NrOfEntries*64);
     if (NrOfEntries != (ret=DeviceCapabilitiesA(devname,portname,DC_PAPERNAMES,Names,dm))) {
-        FIXME("Number of returned vals %ld is not %ld\n",NrOfEntries,ret);
-        goto out;
+    FIXME("Number of returned vals %ld is not %ld\n",NrOfEntries,ret);
+    goto out;
     }
     for (i=0;i<NrOfEntries;i++)
-        if (!strcmp(PaperSize,Names+(64*i)))
-            break;
+    if (!strcmp(PaperSize,Names+(64*i)))
+        break;
     HeapFree(GetProcessHeap(),0,Names);
     if (i==NrOfEntries) {
-        FIXME("Papersize %s not found in list?\n",PaperSize);
-        goto out;
+    FIXME("Papersize %s not found in list?\n",PaperSize);
+    goto out;
     }
     points = HeapAlloc(GetProcessHeap(),0,sizeof(points[0])*NrOfEntries);
     if (NrOfEntries!=(ret=DeviceCapabilitiesA(devname,portname,DC_PAPERSIZE,(LPBYTE)points,dm))) {
-        FIXME("Number of returned sizes %ld is not %ld?\n",NrOfEntries,ret);
-        goto out;
+    FIXME("Number of returned sizes %ld is not %ld?\n",NrOfEntries,ret);
+    goto out;
     }
     /* this is _10ths_ of a millimeter */
@@ -434 +435 @@
  */
 static BOOL PRINTDLG_SetUpPaperComboBox(HWND hDlg,
-                                        int   nIDComboBox,
-                                        char* PrinterName, 
-                                        char* PortName,
-                                        LPDEVMODEA dm)
+                    int   nIDComboBox,
+                    char* PrinterName,
+                    char* PortName,
+                    LPDEVMODEA dm)
 {
     int     i;
@@ -448 +449 @@
     int     fwCapability_Names;
     int     fwCapability_Words;
-    
+
     TRACE(" Printer: %s, ComboID: %d\n",PrinterName,nIDComboBox);
-    
+
     /* query the dialog box for the current selected value */
     Sel = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETCURSEL, 0, 0);
@@ -498 +499 @@
          fwCapability_Words = DC_BINS;
     }
-    
-    /* for some printer drivers, DeviceCapabilities calls a VXD to obtain the 
+
+    /* for some printer drivers, DeviceCapabilities calls a VXD to obtain the
      * paper settings. As Wine doesn't allow VXDs, this results in a crash.
      */
@@ -511 +512 @@
        != NrOfEntries) {
         ERR("Number of caps is different\n");
-        NrOfEntries = 0;
+    NrOfEntries = 0;
     }
 
@@ -519 +520 @@
                                       fwCapability_Names, Names, dm);
     NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName,
-                                      fwCapability_Words, (LPSTR)Words, dm);
+                      fwCapability_Words, (LPSTR)Words, dm);
 
     /* reset any current content in the combobox */
     SendDlgItemMessageA(hDlg, nIDComboBox, CB_RESETCONTENT, 0, 0);
-    
+
     /* store new content */
     for (i = 0; i < NrOfEntries; i++) {
         DWORD pos = SendDlgItemMessageA(hDlg, nIDComboBox, CB_ADDSTRING, 0,
-                                        (LPARAM)(&Names[i*NamesSize]) );
-        SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETITEMDATA, pos, 
-                            Words[i]);
+                    (LPARAM)(&Names[i*NamesSize]) );
+    SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETITEMDATA, pos,
+                Words[i]);
     }
 
@@ -537 +538 @@
     for (i = 0; i < NrOfEntries; i++) {
         if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) ==
-           oldWord) {
-            Sel = i;
-            break;
-        }
+       oldWord) {
+        Sel = i;
+        break;
+    }
     }
     SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0);
@@ -564 +565 @@
     for (i = 0; i < 25; i++) {
         if (pi->Status & (1<<i)) {
-            LoadStringA(COMDLG32_hInstance, PD32_PRINTER_STATUS_PAUSED+i, 
-                        ResourceString, 255);
-            strcat(StatusMsg,ResourceString);
+        LoadStringA(COMDLG32_hInstance, PD32_PRINTER_STATUS_PAUSED+i,
+            ResourceString, 255);
+        strcat(StatusMsg,ResourceString);
         }
     }
     /* append "ready" */
-    /* FIXME: status==ready must only be appended if really so. 
+    /* FIXME: status==ready must only be appended if really so.
               but how to detect? */
-    LoadStringA(COMDLG32_hInstance, PD32_PRINTER_STATUS_READY, 
-                ResourceString, 255);
+    LoadStringA(COMDLG32_hInstance, PD32_PRINTER_STATUS_READY,
+        ResourceString, 255);
     strcat(StatusMsg,ResourceString);
-  
+
     SendDlgItemMessageA(hDlg, stc12, WM_SETTEXT, 0, (LPARAM)StatusMsg);
 
@@ -585 +586 @@
         SendDlgItemMessageA(hDlg, stc14, WM_SETTEXT, 0,(LPARAM)pi->pPortName);
     SendDlgItemMessageA(hDlg, stc13, WM_SETTEXT, 0, (LPARAM)(pi->pComment ?
-                        pi->pComment : ""));
+            pi->pComment : ""));
     return;
 }
@@ -596 +597 @@
  */
 static BOOL PRINTDLG_ChangePrinter(HWND hDlg, char *name,
-                                   PRINT_PTRA *PrintStructures)
+                   PRINT_PTRA *PrintStructures)
 {
     LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
@@ -610 +611 @@
     if(!OpenPrinterA(name, &hprn, NULL)) {
         ERR("Can't open printer %s\n", name);
-        return FALSE;
+    return FALSE;
     }
     GetPrinterA(hprn, 2, NULL, 0, &needed);
     PrintStructures->lpPrinterInfo = HeapAlloc(GetProcessHeap(),0,needed);
     GetPrinterA(hprn, 2, (LPBYTE)PrintStructures->lpPrinterInfo, needed,
-                &needed);
+        &needed);
     GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
     PrintStructures->lpDriverInfo = HeapAlloc(GetProcessHeap(),0,needed);
     if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)PrintStructures->lpDriverInfo,
-            needed, &needed)) {
-        ERR("GetPrinterDriverA failed for %s, fix your config!\n",PrintStructures->lpPrinterInfo->pPrinterName);
-        return FALSE;
+        needed, &needed)) {
+    ERR("GetPrinterDriverA failed for %s, fix your config!\n",PrintStructures->lpPrinterInfo->pPrinterName);
+    return FALSE;
     }
     ClosePrinter(hprn);
@@ -629 +630 @@
     if(PrintStructures->lpDevMode) {
         HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
-        PrintStructures->lpDevMode = NULL;
+    PrintStructures->lpDevMode = NULL;
     }
 
@@ -635 +636 @@
     if(dmSize == -1) {
         ERR("DocumentProperties fails on %s\n", debugstr_a(name));
-        return FALSE;
+    return FALSE;
     }
     PrintStructures->lpDevMode = HeapAlloc(GetProcessHeap(), 0, dmSize);
     dmSize = DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, NULL,
-                                 DM_OUT_BUFFER);
+                 DM_OUT_BUFFER);
     if(lppd->hDevMode && (lpdm = GlobalLock(lppd->hDevMode)) &&
-                          !strcmp(lpdm->dmDeviceName,
-                                  PrintStructures->lpDevMode->dmDeviceName)) {
+              !strcmp(lpdm->dmDeviceName,
+                  PrintStructures->lpDevMode->dmDeviceName)) {
       /* Supplied devicemode matches current printer so try to use it */
         DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, lpdm,
-                            DM_OUT_BUFFER | DM_IN_BUFFER);
+                DM_OUT_BUFFER | DM_IN_BUFFER);
     }
     if(lpdm)
@@ -655 +656 @@
       /* Print range (All/Range/Selection) */
         SetDlgItemInt(hDlg, edt1, lppd->nFromPage, FALSE);
-        SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE);
-        CheckRadioButton(hDlg, rad1, rad3, rad1);               /* default */
-        if (lppd->Flags & PD_NOSELECTION)
-            EnableWindow(GetDlgItem(hDlg, rad2), FALSE);
-        else
-            if (lppd->Flags & PD_SELECTION)
-                CheckRadioButton(hDlg, rad1, rad3, rad2);
-        if (lppd->Flags & PD_NOPAGENUMS) {
-            EnableWindow(GetDlgItem(hDlg, rad3), FALSE);
-            EnableWindow(GetDlgItem(hDlg, stc2),FALSE);
-            EnableWindow(GetDlgItem(hDlg, edt1), FALSE);
-            EnableWindow(GetDlgItem(hDlg, stc3),FALSE);
-            EnableWindow(GetDlgItem(hDlg, edt2), FALSE);
-        } else {
-            if (lppd->Flags & PD_PAGENUMS)
-                CheckRadioButton(hDlg, rad1, rad3, rad3);
-        }
-        /* "All xxx pages"... */
-        {
-            char        resourcestr[64];
-            char        result[64];
-            LoadStringA(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES, 
-                        resourcestr, 49);
-            sprintf(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1);
-            SendDlgItemMessageA(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result);
-        }
-        
-        /* Collate pages 
-         *
-         * FIXME: The ico3 is not displayed for some reason. I don't know why.
-         */
-        if (lppd->Flags & PD_COLLATE) {
-            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, 
-                                (LPARAM)PrintStructures->hCollateIcon);
-            CheckDlgButton(hDlg, chx2, 1);
-        } else {
-            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, 
-                                (LPARAM)PrintStructures->hNoCollateIcon);
-            CheckDlgButton(hDlg, chx2, 0);
-        }
-
-        if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
-          /* if printer doesn't support it: no Collate */
-            if (!(lpdm->dmFields & DM_COLLATE)) {
-                EnableWindow(GetDlgItem(hDlg, chx2), FALSE);    
-                EnableWindow(GetDlgItem(hDlg, ico3), FALSE);    
-            }
-        }
-
-        /* nCopies */
-        {
-          INT copies;
-          if (lppd->hDevMode == 0)
-              copies = lppd->nCopies;
-          else
-              copies = lpdm->dmCopies;
-          if(copies == 0) copies = 1;
-          else if(copies < 0) copies = MAX_COPIES;
-          SetDlgItemInt(hDlg, edt3, copies, FALSE);
-        }
-
-        if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
-          /* if printer doesn't support it: no nCopies */
-            if (!(lpdm->dmFields & DM_COPIES)) {
-                EnableWindow(GetDlgItem(hDlg, edt3), FALSE);    
-                EnableWindow(GetDlgItem(hDlg, stc5), FALSE);    
-            }
-        }
-
-        /* print to file */
-        CheckDlgButton(hDlg, chx1, (lppd->Flags & PD_PRINTTOFILE) ? 1 : 0);
-        if (lppd->Flags & PD_DISABLEPRINTTOFILE)
-            EnableWindow(GetDlgItem(hDlg, chx1), FALSE);    
-        if (lppd->Flags & PD_HIDEPRINTTOFILE)
+    SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE);
+    CheckRadioButton(hDlg, rad1, rad3, rad1);       /* default */
+    if (lppd->Flags & PD_NOSELECTION)
+        EnableWindow(GetDlgItem(hDlg, rad2), FALSE);
+    else
+        if (lppd->Flags & PD_SELECTION)
+            CheckRadioButton(hDlg, rad1, rad3, rad2);
+    if (lppd->Flags & PD_NOPAGENUMS) {
+        EnableWindow(GetDlgItem(hDlg, rad3), FALSE);
+        EnableWindow(GetDlgItem(hDlg, stc2),FALSE);
+        EnableWindow(GetDlgItem(hDlg, edt1), FALSE);
+        EnableWindow(GetDlgItem(hDlg, stc3),FALSE);
+        EnableWindow(GetDlgItem(hDlg, edt2), FALSE);
+    } else {
+        if (lppd->Flags & PD_PAGENUMS)
+            CheckRadioButton(hDlg, rad1, rad3, rad3);
+    }
+    /* "All xxx pages"... */
+    {
+        char        resourcestr[64];
+        char        result[64];
+        LoadStringA(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES,
+            resourcestr, 49);
+        sprintf(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1);
+        SendDlgItemMessageA(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result);
+    }
+
+    /* Collate pages
+     *
+     * FIXME: The ico3 is not displayed for some reason. I don't know why.
+     */
+    if (lppd->Flags & PD_COLLATE) {
+        SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                (LPARAM)PrintStructures->hCollateIcon);
+        CheckDlgButton(hDlg, chx2, 1);
+    } else {
+        SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                (LPARAM)PrintStructures->hNoCollateIcon);
+        CheckDlgButton(hDlg, chx2, 0);
+    }
+
+    if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
+      /* if printer doesn't support it: no Collate */
+        if (!(lpdm->dmFields & DM_COLLATE)) {
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+        EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
+        }
+    }
+
+    /* nCopies */
+    {
+      INT copies;
+      if (lppd->hDevMode == 0)
+          copies = lppd->nCopies;
+      else
+          copies = lpdm->dmCopies;
+      if(copies == 0) copies = 1;
+      else if(copies < 0) copies = MAX_COPIES;
+      SetDlgItemInt(hDlg, edt3, copies, FALSE);
+    }
+
+    if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
+      /* if printer doesn't support it: no nCopies */
+        if (!(lpdm->dmFields & DM_COPIES)) {
+            EnableWindow(GetDlgItem(hDlg, edt3), FALSE);
+        EnableWindow(GetDlgItem(hDlg, stc5), FALSE);
+        }
+    }
+
+    /* print to file */
+    CheckDlgButton(hDlg, chx1, (lppd->Flags & PD_PRINTTOFILE) ? 1 : 0);
+    if (lppd->Flags & PD_DISABLEPRINTTOFILE)
+            EnableWindow(GetDlgItem(hDlg, chx1), FALSE);
+    if (lppd->Flags & PD_HIDEPRINTTOFILE)
             ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
 
@@ -739 +740 @@
 
       PRINTDLG_SetUpPaperComboBox(hDlg, cmb2,
-                                  PrintStructures->lpPrinterInfo->pPrinterName,
-                                  PrintStructures->lpPrinterInfo->pPortName,
-                                  lpdm);
+                  PrintStructures->lpPrinterInfo->pPrinterName,
+                  PrintStructures->lpPrinterInfo->pPortName,
+                  lpdm);
       PRINTDLG_SetUpPaperComboBox(hDlg, cmb3,
-                                  PrintStructures->lpPrinterInfo->pPrinterName,
-                                  PrintStructures->lpPrinterInfo->pPortName,
-                                  lpdm);
+                  PrintStructures->lpPrinterInfo->pPrinterName,
+                  PrintStructures->lpPrinterInfo->pPortName,
+                  lpdm);
       CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2);
       SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
                           (LPARAM)(bPortrait ? PrintStructures->hPortraitIcon :
                                    PrintStructures->hLandscapeIcon));
-      
+
     }
 
@@ -756 +757 @@
     if ((lppd->Flags & PD_SHOWHELP)==0) {
         /* hide if PD_SHOWHELP not specified */
-        ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE);         
+        ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE);
     }
     return TRUE;
@@ -765 +766 @@
  */
 static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
-                                     PRINT_PTRA* PrintStructures)
+                     PRINT_PTRA* PrintStructures)
 {
     LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
@@ -778 +779 @@
     PrintStructures->hCollateIcon =
       LoadImageA(COMDLG32_hInstance, "PD32_COLLATE", IMAGE_ICON, 0, 0, 0);
-    PrintStructures->hNoCollateIcon = 
+    PrintStructures->hNoCollateIcon =
       LoadImageA(COMDLG32_hInstance, "PD32_NOCOLLATE", IMAGE_ICON, 0, 0, 0);
 
@@ -792 +793 @@
        PrintStructures->hLandscapeIcon == 0) {
         ERR("no icon in resourcefile\n");
-        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-        EndDialog(hDlg, FALSE);
+    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+    EndDialog(hDlg, FALSE);
     }
 
@@ -801 +802 @@
      */
     if (lppd->Flags & PD_SHOWHELP) {
-        if((PrintStructures->HelpMessageID = 
-            RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
-            COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
-            return FALSE;
-        }
+        if((PrintStructures->HelpMessageID =
+        RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
+        COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+        return FALSE;
+    }
     } else
         PrintStructures->HelpMessageID = 0;
@@ -811 +812 @@
     if(!(lppd->Flags &PD_PRINTSETUP)) {
         PrintStructures->hwndUpDown =
-          CreateUpDownControl(WS_CHILD | WS_VISIBLE | WS_BORDER |
-                              UDS_NOTHOUSANDS | UDS_ARROWKEYS |
-                              UDS_ALIGNRIGHT | UDS_SETBUDDYINT, 0, 0, 0, 0,
-                              hDlg, UPDOWN_ID, COMDLG32_hInstance,
-                              GetDlgItem(hDlg, edt3), MAX_COPIES, 1, 1);
+      CreateUpDownControl(WS_CHILD | WS_VISIBLE | WS_BORDER |
+                  UDS_NOTHOUSANDS | UDS_ARROWKEYS |
+                  UDS_ALIGNRIGHT | UDS_SETBUDDYINT, 0, 0, 0, 0,
+                  hDlg, UPDOWN_ID, COMDLG32_hInstance,
+                  GetDlgItem(hDlg, edt3), MAX_COPIES, 1, 1);
     }
 
@@ -823 +824 @@
      */
     if (lppd->nMaxPage < lppd->nMinPage)
-        lppd->nMaxPage = lppd->nMinPage;
-    if (lppd->nMinPage == lppd->nMaxPage) 
-        lppd->Flags |= PD_NOPAGENUMS;        
+        lppd->nMaxPage = lppd->nMinPage;
+    if (lppd->nMinPage == lppd->nMaxPage)
+        lppd->Flags |= PD_NOPAGENUMS;
     if (lppd->nToPage < lppd->nMinPage)
         lppd->nToPage = lppd->nMinPage;
@@ -837 +838 @@
     /* if we have the combo box, fill it */
     if (GetDlgItem(hDlg,comboID)) {
-        /* Fill Combobox 
-         */
-        pdn = GlobalLock(lppd->hDevNames);
-        pdm = GlobalLock(lppd->hDevMode);
-        if(pdn)
-            name = (char*)pdn + pdn->wDeviceOffset;
-        else if(pdm)
-            name = pdm->dmDeviceName;
-        PRINTDLG_SetUpPrinterListCombo(hDlg, comboID, name);
-        if(pdm) GlobalUnlock(lppd->hDevMode);
-        if(pdn) GlobalUnlock(lppd->hDevNames);
-
-        /* Now find selected printer and update rest of dlg */
-        name = HeapAlloc(GetProcessHeap(),0,256);
-        if (GetDlgItemTextA(hDlg, comboID, name, 255))
-            PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
-        HeapFree(GetProcessHeap(),0,name);
+    /* Fill Combobox
+     */
+    pdn = GlobalLock(lppd->hDevNames);
+    pdm = GlobalLock(lppd->hDevMode);
+    if(pdn)
+        name = (char*)pdn + pdn->wDeviceOffset;
+    else if(pdm)
+        name = pdm->dmDeviceName;
+    PRINTDLG_SetUpPrinterListCombo(hDlg, comboID, name);
+    if(pdm) GlobalUnlock(lppd->hDevMode);
+    if(pdn) GlobalUnlock(lppd->hDevNames);
+
+    /* Now find selected printer and update rest of dlg */
+    name = HeapAlloc(GetProcessHeap(),0,256);
+    if (GetDlgItemTextA(hDlg, comboID, name, 255))
+        PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
+    HeapFree(GetProcessHeap(),0,name);
     } else {
-        /* else use default printer */
-        char name[200];
-        BOOL ret = PRINTDLG_GetDefaultPrinterName(name, sizeof(name));
-
-        if (ret)
-            PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
-        else
-            FIXME("No default printer found, expect problems!\n");
+    /* else use default printer */
+    char name[200];
+    BOOL ret = PRINTDLG_GetDefaultPrinterName(name, sizeof(name));
+
+    if (ret)
+        PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
+    else
+        FIXME("No default printer found, expect problems!\n");
     }
     return TRUE;
@@ -872 +873 @@
  */
 static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam,
-                                     PRINT_PTRA* PrintStructures)
+                     PRINT_PTRA* PrintStructures)
 {
     LPPRINTDLG16 lppd = PrintStructures->dlg.lpPrintDlg16;
@@ -883 +884 @@
     PrintStructures->hCollateIcon =
       LoadIconA(COMDLG32_hInstance, "PD32_COLLATE");
-    PrintStructures->hNoCollateIcon = 
+    PrintStructures->hNoCollateIcon =
       LoadIconA(COMDLG32_hInstance, "PD32_NOCOLLATE");
     if(PrintStructures->hCollateIcon == 0 ||
        PrintStructures->hNoCollateIcon == 0) {
         ERR("no icon in resourcefile\n");
-        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-        EndDialog(hDlg, FALSE);
+    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+    EndDialog(hDlg, FALSE);
     }
 
@@ -900 +901 @@
      */
     if (lppd->Flags & PD_SHOWHELP) {
-        if((PrintStructures->HelpMessageID = 
-            RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
-            COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
-            return FALSE;
-        }
+        if((PrintStructures->HelpMessageID =
+        RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
+        COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+        return FALSE;
+    }
     } else
         PrintStructures->HelpMessageID = 0;
 
     if (!(lppd->Flags & PD_PRINTSETUP)) {
-        /* We have a print quality combo box. What shall we do? */
-        if (GetDlgItem(hDlg,cmb1)) {
-            char buf [20];
-
-            FIXME("Print quality only displaying currently.\n");
-
-            pdm = GlobalLock16(lppd->hDevMode);
-            if(pdm) {
-                switch (pdm->dmPrintQuality) {
-                case DMRES_HIGH         : strcpy(buf,"High");break;
-                case DMRES_MEDIUM       : strcpy(buf,"Medium");break;
-                case DMRES_LOW          : strcpy(buf,"Low");break;
-                case DMRES_DRAFT        : strcpy(buf,"Draft");break;
-                case 0                  : strcpy(buf,"Default");break;
-                default                 : sprintf(buf,"%ddpi",pdm->dmPrintQuality);break;
-                }
-                GlobalUnlock16(lppd->hDevMode);
-            } else 
-                strcpy(buf,"Default");
-            SendDlgItemMessageA(hDlg,cmb1,CB_ADDSTRING,0,(LPARAM)buf);
-            SendDlgItemMessageA(hDlg,cmb1,CB_SETCURSEL,0,0);
-            EnableWindow(GetDlgItem(hDlg,cmb1),FALSE);
-        }
+    /* We have a print quality combo box. What shall we do? */
+    if (GetDlgItem(hDlg,cmb1)) {
+        char buf [20];
+
+        FIXME("Print quality only displaying currently.\n");
+
+        pdm = GlobalLock16(lppd->hDevMode);
+        if(pdm) {
+        switch (pdm->dmPrintQuality) {
+        case DMRES_HIGH     : strcpy(buf,"High");break;
+        case DMRES_MEDIUM   : strcpy(buf,"Medium");break;
+        case DMRES_LOW      : strcpy(buf,"Low");break;
+        case DMRES_DRAFT    : strcpy(buf,"Draft");break;
+        case 0          : strcpy(buf,"Default");break;
+        default         : sprintf(buf,"%ddpi",pdm->dmPrintQuality);break;
+        }
+            GlobalUnlock16(lppd->hDevMode);
+        } else
+        strcpy(buf,"Default");
+        SendDlgItemMessageA(hDlg,cmb1,CB_ADDSTRING,0,(LPARAM)buf);
+        SendDlgItemMessageA(hDlg,cmb1,CB_SETCURSEL,0,0);
+        EnableWindow(GetDlgItem(hDlg,cmb1),FALSE);
+    }
     }
 
@@ -939 +940 @@
      */
     if (lppd->nMaxPage < lppd->nMinPage)
-        lppd->nMaxPage = lppd->nMinPage;
-    if (lppd->nMinPage == lppd->nMaxPage) 
-        lppd->Flags |= PD_NOPAGENUMS;        
+        lppd->nMaxPage = lppd->nMinPage;
+    if (lppd->nMinPage == lppd->nMaxPage)
+        lppd->Flags |= PD_NOPAGENUMS;
     if (lppd->nToPage < lppd->nMinPage)
         lppd->nToPage = lppd->nMinPage;
@@ -953 +954 @@
     /* If the printer combo box is in the dialog, fill it */
     if (GetDlgItem(hDlg,comboID)) {
-        /* Fill Combobox 
-         */
-        pdn = GlobalLock16(lppd->hDevNames);
-        pdm = GlobalLock16(lppd->hDevMode);
-        if(pdn)
-            name = (char*)pdn + pdn->wDeviceOffset;
-        else if(pdm)
-            name = pdm->dmDeviceName;
-        PRINTDLG_SetUpPrinterListCombo(hDlg, comboID, name);
-        if(pdm) GlobalUnlock16(lppd->hDevMode);
-        if(pdn) GlobalUnlock16(lppd->hDevNames);
-
-        /* Now find selected printer and update rest of dlg */
-        name = HeapAlloc(GetProcessHeap(),0,256);
-        if (GetDlgItemTextA(hDlg, comboID, name, 255))
-            PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
+    /* Fill Combobox
+     */
+    pdn = GlobalLock16(lppd->hDevNames);
+    pdm = GlobalLock16(lppd->hDevMode);
+    if(pdn)
+        name = (char*)pdn + pdn->wDeviceOffset;
+    else if(pdm)
+        name = pdm->dmDeviceName;
+    PRINTDLG_SetUpPrinterListCombo(hDlg, comboID, name);
+    if(pdm) GlobalUnlock16(lppd->hDevMode);
+    if(pdn) GlobalUnlock16(lppd->hDevNames);
+
+    /* Now find selected printer and update rest of dlg */
+    name = HeapAlloc(GetProcessHeap(),0,256);
+    if (GetDlgItemTextA(hDlg, comboID, name, 255))
+        PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
     } else {
-        /* else just use default printer */
-        char name[200];
-        BOOL ret = PRINTDLG_GetDefaultPrinterName(name, sizeof(name));
-
-        if (ret)
-            PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
-        else
-            FIXME("No default printer found, expect problems!\n");
+    /* else just use default printer */
+    char name[200];
+    BOOL ret = PRINTDLG_GetDefaultPrinterName(name, sizeof(name));
+
+    if (ret)
+        PRINTDLG_ChangePrinter(hDlg, name, PrintStructures);
+    else
+        FIXME("No default printer found, expect problems!\n");
     }
     HeapFree(GetProcessHeap(),0,name);
@@ -988 +989 @@
  *                              PRINTDLG_WMCommand               [internal]
  */
-static LRESULT PRINTDLG_WMCommand(HWND hDlg, WPARAM wParam, 
-                        LPARAM lParam, PRINT_PTRA* PrintStructures)
+static LRESULT PRINTDLG_WMCommand(HWND hDlg, WPARAM wParam,
+            LPARAM lParam, PRINT_PTRA* PrintStructures)
 {
     LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
@@ -999 +1000 @@
         TRACE(" OK button was hit\n");
         if (PRINTDLG_UpdatePrintDlg(hDlg, PrintStructures)!=TRUE) {
-            FIXME("Update printdlg was not successful!\n");
-            return(FALSE);
-        }
-        EndDialog(hDlg, TRUE);
-        return(TRUE);
+        FIXME("Update printdlg was not successful!\n");
+        return(FALSE);
+    }
+    EndDialog(hDlg, TRUE);
+    return(TRUE);
 
     case IDCANCEL:
         TRACE(" CANCEL button was hit\n");
         EndDialog(hDlg, FALSE);
-        return(FALSE);
+    return(FALSE);
 
      case pshHelp:
         TRACE(" HELP button was hit\n");
-        SendMessageA(lppd->hwndOwner, PrintStructures->HelpMessageID, 
-                                (WPARAM) hDlg, (LPARAM) lppd);
+        SendMessageA(lppd->hwndOwner, PrintStructures->HelpMessageID,
+                    (WPARAM) hDlg, (LPARAM) lppd);
         break;
 
      case chx2:                         /* collate pages checkbox */
         if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
-            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, 
+            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
                                     (LPARAM)PrintStructures->hCollateIcon);
         else
-            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, 
+            SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
                                     (LPARAM)PrintStructures->hNoCollateIcon);
-        break;        
+        break;
      case edt1:                         /* from page nr editbox */
      case edt2:                         /* to page nr editbox */
         if (HIWORD(wParam)==EN_CHANGE) {
-            WORD nToPage;
-            WORD nFromPage;
-            nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
-            nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
+        WORD nToPage;
+        WORD nFromPage;
+        nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
+        nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
             if (nFromPage != lppd->nFromPage || nToPage != lppd->nToPage)
-                CheckRadioButton(hDlg, rad1, rad3, rad3);
-        }
+            CheckRadioButton(hDlg, rad1, rad3, rad3);
+    }
         break;
 
     case edt3:
         if(HIWORD(wParam) == EN_CHANGE) {
-            INT copies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
-            if(copies <= 1)
-                EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
-            else
-                EnableWindow(GetDlgItem(hDlg, chx2), TRUE);
-        }
-        break;
+        INT copies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+        if(copies <= 1)
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+        else
+            EnableWindow(GetDlgItem(hDlg, chx2), TRUE);
+    }
+    break;
 
 #ifndef __WIN32OS2__
      case psh1:                       /* Print Setup */
-        {
-            PRINTDLG16  pdlg;
-            
-            if (!PrintStructures->dlg.lpPrintDlg16) {
-                FIXME("The 32bit print dialog does not have this button!?\n");
-                break;
-            }
-
-            memcpy(&pdlg,PrintStructures->dlg.lpPrintDlg16,sizeof(pdlg));
-            pdlg.Flags |= PD_PRINTSETUP;
-            pdlg.hwndOwner = hDlg;
-            if (!PrintDlg16(&pdlg))
-                break;
-        }
-        break;
+    {
+        PRINTDLG16  pdlg;
+
+        if (!PrintStructures->dlg.lpPrintDlg16) {
+        FIXME("The 32bit print dialog does not have this button!?\n");
+        break;
+        }
+
+        memcpy(&pdlg,PrintStructures->dlg.lpPrintDlg16,sizeof(pdlg));
+        pdlg.Flags |= PD_PRINTSETUP;
+        pdlg.hwndOwner = hDlg;
+        if (!PrintDlg16(&pdlg))
+        break;
+    }
+    break;
 #endif
 
@@ -1072 +1073 @@
          GetDlgItemTextA(hDlg, PrinterComboID, PrinterName, 255);
          if (!OpenPrinterA(PrinterName, &hPrinter, NULL)) {
-             FIXME(" Call to OpenPrinter did not succeed!\n");
-             break;
-         }
-         DocumentPropertiesA(hDlg, hPrinter, PrinterName, 
-                             PrintStructures->lpDevMode,
-                             PrintStructures->lpDevMode,
-                             DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
-         ClosePrinter(hPrinter);
+         FIXME(" Call to OpenPrinter did not succeed!\n");
+         break;
+     }
+     DocumentPropertiesA(hDlg, hPrinter, PrinterName,
+                 PrintStructures->lpDevMode,
+                 PrintStructures->lpDevMode,
+                 DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
+     ClosePrinter(hPrinter);
          break;
        }
@@ -1095 +1096 @@
         }
         break;
-            
+
     case rad2: /* Paperorientation */
         if (lppd->Flags & PD_PRINTSETUP)
@@ -1108 +1109 @@
         }
         break;
-            
+
     case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT */
-         if (PrinterComboID != wParam) {
-             FIXME("No handling for print quality combo box yet.\n");
-             break;
-         }
-         /* FALLTHROUGH */
+     if (PrinterComboID != wParam) {
+         FIXME("No handling for print quality combo box yet.\n");
+         break;
+     }
+     /* FALLTHROUGH */
     case cmb4:                         /* Printer combobox */
          if (HIWORD(wParam)==CBN_SELCHANGE) {
-             char   PrinterName[256];
-             GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255);
-             PRINTDLG_ChangePrinter(hDlg, PrinterName, PrintStructures);
-         }
-         break;
+         char   PrinterName[256];
+         GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255);
+         PRINTDLG_ChangePrinter(hDlg, PrinterName, PrintStructures);
+     }
+     break;
 
     case cmb2: /* Papersize */
       {
-          DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
-          if(Sel != CB_ERR)
+      DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+      if(Sel != CB_ERR)
 #ifdef __WIN32OS2__
-              lpdm->dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+          lpdm->dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
 #else
-              lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+          lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
 #endif
-                                                            CB_GETITEMDATA,
-                                                            Sel, 0);
+                                CB_GETITEMDATA,
+                                Sel, 0);
       }
       break;
@@ -1139 +1140 @@
     case cmb3: /* Bin */
       {
-          DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
-          if(Sel != CB_ERR)
-              lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
-                                                          CB_GETITEMDATA, Sel,
-                                                          0);
+      DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+      if(Sel != CB_ERR)
+          lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+                              CB_GETITEMDATA, Sel,
+                              0);
       }
-      break; 
+      break;
     }
     if(lppd->Flags & PD_PRINTSETUP) {
         switch (LOWORD(wParam)) {
-        case rad1:                         /* orientation */
-        case rad2:
-            if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
+    case rad1:                         /* orientation */
+    case rad2:
+        if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
 #ifdef __WIN32OS2__
-                if(lpdm->dmOrientation != DMORIENT_PORTRAIT) {
-                    lpdm->dmOrientation = DMORIENT_PORTRAIT;
+            if(lpdm->dmOrientation != DMORIENT_PORTRAIT) {
+            lpdm->dmOrientation = DMORIENT_PORTRAIT;
 #else
-                if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
-                    lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+            if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+            lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
 #endif
-                    SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
-                                        (WPARAM)IMAGE_ICON,
-                                        (LPARAM)PrintStructures->hPortraitIcon);
-                    SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE,
-                                        (WPARAM)IMAGE_ICON,
-                                        (LPARAM)PrintStructures->hPortraitIcon);
-                }
-            } else {
+            SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+                    (WPARAM)IMAGE_ICON,
+                    (LPARAM)PrintStructures->hPortraitIcon);
+            SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE,
+                    (WPARAM)IMAGE_ICON,
+                    (LPARAM)PrintStructures->hPortraitIcon);
+        }
+        } else {
 #ifdef __WIN32OS2__
-                if(lpdm->dmOrientation != DMORIENT_LANDSCAPE) {
-                    lpdm->dmOrientation = DMORIENT_LANDSCAPE;
+            if(lpdm->dmOrientation != DMORIENT_LANDSCAPE) {
+            lpdm->dmOrientation = DMORIENT_LANDSCAPE;
 #else
-                if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
-                    lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+            if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+                lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
 #endif
-                    SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
-                                        (WPARAM)IMAGE_ICON,
-                                        (LPARAM)PrintStructures->hLandscapeIcon);
-                    SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE,
-                                        (WPARAM)IMAGE_ICON,
-                                        (LPARAM)PrintStructures->hLandscapeIcon);
-                }
-            }
-            break;
-        }
+            SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+                    (WPARAM)IMAGE_ICON,
+                    (LPARAM)PrintStructures->hLandscapeIcon);
+            SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE,
+                    (WPARAM)IMAGE_ICON,
+                    (LPARAM)PrintStructures->hLandscapeIcon);
+        }
+        }
+        break;
+    }
     }
     return FALSE;
-}    
+}
 
 /***********************************************************************
- *           PrintDlgProcA                      [internal]
+ *           PrintDlgProcA          [internal]
  */
 #ifdef __WIN32OS2__
 LRESULT WINAPI PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
-                             LPARAM lParam)
+                 LPARAM lParam)
 #else
 BOOL WINAPI PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
-                          LPARAM lParam)
+              LPARAM lParam)
 #endif
 {
@@ -1203 +1204 @@
 
     if (uMsg!=WM_INITDIALOG) {
-        PrintStructures = (PRINT_PTRA*) GetWindowLongA(hDlg, DWL_USER);   
-        if (!PrintStructures)
-            return FALSE;
+        PrintStructures = (PRINT_PTRA*) GetWindowLongA(hDlg, DWL_USER);
+    if (!PrintStructures)
+        return FALSE;
     } else {
         PrintStructures = (PRINT_PTRA*) lParam;
-        SetWindowLongA(hDlg, DWL_USER, lParam); 
-        res = PRINTDLG_WMInitDialog(hDlg, wParam, PrintStructures);
-
-        if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
-            res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(
-                hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg
-            ); 
-        return res;
-    }
-  
+    SetWindowLongA(hDlg, DWL_USER, lParam);
+    res = PRINTDLG_WMInitDialog(hDlg, wParam, PrintStructures);
+
+    if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
+        res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(
+        hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg
+        );
+    return res;
+    }
+
     if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
         res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(hDlg,uMsg,wParam,
-                                                         lParam);
-        if(res) return res;
+                             lParam);
+    if(res) return res;
     }
 
@@ -1229 +1230 @@
 
     case WM_DESTROY:
-        DestroyIcon(PrintStructures->hCollateIcon);
-        DestroyIcon(PrintStructures->hNoCollateIcon);
+    DestroyIcon(PrintStructures->hCollateIcon);
+    DestroyIcon(PrintStructures->hNoCollateIcon);
         DestroyIcon(PrintStructures->hPortraitIcon);
         DestroyIcon(PrintStructures->hLandscapeIcon);
-        if(PrintStructures->hwndUpDown)
-            DestroyWindow(PrintStructures->hwndUpDown);
+    if(PrintStructures->hwndUpDown)
+        DestroyWindow(PrintStructures->hwndUpDown);
         return FALSE;
-    }    
+    }
     return res;
 }
@@ -1255 +1256 @@
         HGLOBAL16 hGlobal16;
         LPVOID template;
- 
+
         if (!(hResInfo = FindResourceA(COMMDLG_hInstance32,
                PrintResourceName, RT_DIALOGA)))
@@ -1300 +1301 @@
 
     if (lppd->Flags & PD_PRINTSETUP) {
-        if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) {
-            hDlgTmpl = lppd->hSetupTemplate;
-        } else if(lppd->Flags & PD_ENABLESETUPTEMPLATE) {       
-            hResInfo = FindResourceA(lppd->hInstance,
-                                     lppd->lpSetupTemplateName, RT_DIALOGA);
-            hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
-        } else {
-            hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32_SETUP",
-                                     RT_DIALOGA);
-            hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo);
-        }
+    if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) {
+        hDlgTmpl = lppd->hSetupTemplate;
+    } else if(lppd->Flags & PD_ENABLESETUPTEMPLATE) {
+        hResInfo = FindResourceA(lppd->hInstance,
+                     lppd->lpSetupTemplateName, RT_DIALOGA);
+        hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
     } else {
-        if(lppd->Flags & PD_ENABLEPRINTTEMPLATEHANDLE) {
-            hDlgTmpl = lppd->hPrintTemplate;
-        } else if(lppd->Flags & PD_ENABLEPRINTTEMPLATE) {
-            hResInfo = FindResourceA(lppd->hInstance,
-                                     lppd->lpPrintTemplateName,
-                                     RT_DIALOGA);
-            hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
-        } else {
-            hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32",
-                                     RT_DIALOGA);
-            hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo);
-        }
+        hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32_SETUP",
+                     RT_DIALOGA);
+        hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo);
+    }
+    } else {
+    if(lppd->Flags & PD_ENABLEPRINTTEMPLATEHANDLE) {
+        hDlgTmpl = lppd->hPrintTemplate;
+    } else if(lppd->Flags & PD_ENABLEPRINTTEMPLATE) {
+        hResInfo = FindResourceA(lppd->hInstance,
+                     lppd->lpPrintTemplateName,
+                     RT_DIALOGA);
+        hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
+    } else {
+        hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32",
+                     RT_DIALOGA);
+        hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo);
+    }
     }
     return hDlgTmpl;
@@ -1340 +1341 @@
 
     if (lppd->Flags & PD_PRINTSETUP) {
-        if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) {
-            hDlgTmpl = lppd->hSetupTemplate;
-        } else if(lppd->Flags & PD_ENABLESETUPTEMPLATE) {       
-            hResInfo = FindResource16(lppd->hInstance,
-                                     MapSL(lppd->lpSetupTemplateName), RT_DIALOGA);
-            hDlgTmpl = LoadResource16(lppd->hInstance, hResInfo);
-        } else {
-            hDlgTmpl = PRINTDLG_Get16TemplateFrom32("PRINT32_SETUP");
-        }
+    if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) {
+        hDlgTmpl = lppd->hSetupTemplate;
+    } else if(lppd->Flags & PD_ENABLESETUPTEMPLATE) {
+        hResInfo = FindResource16(lppd->hInstance,
+                     MapSL(lppd->lpSetupTemplateName), RT_DIALOGA);
+        hDlgTmpl = LoadResource16(lppd->hInstance, hResInfo);
     } else {
-        if(lppd->Flags & PD_ENABLEPRINTTEMPLATEHANDLE) {
-            hDlgTmpl = lppd->hPrintTemplate;
-        } else if(lppd->Flags & PD_ENABLEPRINTTEMPLATE) {
-            hResInfo = FindResource16(lppd->hInstance,
-                                     MapSL(lppd->lpPrintTemplateName),
-                                     RT_DIALOGA);
-            hDlgTmpl = LoadResource16(lppd->hInstance, hResInfo);
-        } else {
-            hDlgTmpl = PRINTDLG_Get16TemplateFrom32("PRINT32");
-        }
+        hDlgTmpl = PRINTDLG_Get16TemplateFrom32("PRINT32_SETUP");
+    }
+    } else {
+    if(lppd->Flags & PD_ENABLEPRINTTEMPLATEHANDLE) {
+        hDlgTmpl = lppd->hPrintTemplate;
+    } else if(lppd->Flags & PD_ENABLEPRINTTEMPLATE) {
+        hResInfo = FindResource16(lppd->hInstance,
+                     MapSL(lppd->lpPrintTemplateName),
+                     RT_DIALOGA);
+        hDlgTmpl = LoadResource16(lppd->hInstance, hResInfo);
+    } else {
+        hDlgTmpl = PRINTDLG_Get16TemplateFrom32("PRINT32");
+    }
     }
     return hDlgTmpl;
@@ -1377 +1378 @@
     if(lppd->Flags & PD_RETURNDC) {
         lppd->hDC = CreateDCA((char*)pdn + pdn->wDriverOffset,
-                              (char*)pdn + pdn->wDeviceOffset,
-                              (char*)pdn + pdn->wOutputOffset,
-                              pdm );
+                  (char*)pdn + pdn->wDeviceOffset,
+                  (char*)pdn + pdn->wOutputOffset,
+                  pdm );
     } else if(lppd->Flags & PD_RETURNIC) {
         lppd->hDC = CreateICA((char*)pdn + pdn->wDriverOffset,
-                              (char*)pdn + pdn->wDeviceOffset,
-                              (char*)pdn + pdn->wOutputOffset,
-                              pdm );
+                  (char*)pdn + pdn->wDeviceOffset,
+                  (char*)pdn + pdn->wOutputOffset,
+                  pdm );
     }
     GlobalUnlock(lppd->hDevNames);
@@ -1399 +1400 @@
     if(lppd->Flags & PD_RETURNDC) {
         lppd->hDC = CreateDCA((char*)pdn + pdn->wDriverOffset,
-                              (char*)pdn + pdn->wDeviceOffset,
-                              (char*)pdn + pdn->wOutputOffset,
-                              pdm );
+                  (char*)pdn + pdn->wDeviceOffset,
+                  (char*)pdn + pdn->wOutputOffset,
+                  pdm );
     } else if(lppd->Flags & PD_RETURNIC) {
         lppd->hDC = CreateICA((char*)pdn + pdn->wDriverOffset,
-                              (char*)pdn + pdn->wDeviceOffset,
-                              (char*)pdn + pdn->wOutputOffset,
-                              pdm );
+                  (char*)pdn + pdn->wDeviceOffset,
+                  (char*)pdn + pdn->wOutputOffset,
+                  pdm );
     }
     GlobalUnlock16(lppd->hDevNames);
@@ -1431 +1432 @@
  *  * The Paper Orientation Icons are not implemented yet.
  *  * The Properties Button(s) should call DocumentPropertiesA().
- *  * Settings are not yet taken from a provided DevMode or 
+ *  * Settings are not yet taken from a provided DevMode or
  *    default printer settings.
  */
 BOOL WINAPI PrintDlgA(
-                      LPPRINTDLGA lppd /* [in/out] ptr to PRINTDLG32 struct */
-                      )
+              LPPRINTDLGA lppd /* [in/out] ptr to PRINTDLG32 struct */
+              )
 {
     BOOL      bRet = FALSE;
@@ -1448 +1449 @@
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-        struct pd_flags *pflag = pd_flags;
-        for( ; pflag->name; pflag++) {
-            if(lppd->Flags & pflag->flag)
-                strcat(flagstr, pflag->name);
-        }
-        TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
-              "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
-              "flags %08lx (%s)\n",
-              lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
-              lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
-              lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
+    struct pd_flags *pflag = pd_flags;
+    for( ; pflag->name; pflag++) {
+        if(lppd->Flags & pflag->flag)
+            strcat(flagstr, pflag->name);
+    }
+    TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
+          "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
+          "flags %08lx (%s)\n",
+          lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
+          lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
+          lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
     }
 
     if(lppd->lStructSize != sizeof(PRINTDLGA)) {
         WARN("structure size failure !!!\n");
-        COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
-        return FALSE; 
+    COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
+    return FALSE;
     }
 
     if(lppd->Flags & PD_RETURNDEFAULT) {
         PRINTER_INFO_2A *pbuf;
-        DRIVER_INFO_3A  *dbuf;
-        HANDLE hprn;
-        DWORD needed;
-
-        if(lppd->hDevMode || lppd->hDevNames) {
-            WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n");
-            COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); 
-            return FALSE;
-        }
+    DRIVER_INFO_3A  *dbuf;
+    HANDLE hprn;
+    DWORD needed;
+
+    if(lppd->hDevMode || lppd->hDevNames) {
+        WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n");
+        COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
+        return FALSE;
+    }
         if(!PRINTDLG_OpenDefaultPrinter(&hprn)) {
-            WARN("Can't find default printer\n");
-            COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN); 
-            return FALSE;
-        }
-
-        GetPrinterA(hprn, 2, NULL, 0, &needed);
-        pbuf = HeapAlloc(GetProcessHeap(), 0, needed);
-        GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed);
-
-        GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
-        dbuf = HeapAlloc(GetProcessHeap(),0,needed);
-        if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-            ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName);
-            COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); 
-            return FALSE;
-        }
-        ClosePrinter(hprn);
-
-        PRINTDLG_CreateDevNames(&(lppd->hDevNames),
-                                  dbuf->pDriverPath,
-                                  pbuf->pPrinterName,
-                                  pbuf->pPortName);
-        lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize +
-                                     pbuf->pDevMode->dmDriverExtra);
-        ptr = GlobalLock(lppd->hDevMode);
-        memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize +
-               pbuf->pDevMode->dmDriverExtra);
-        GlobalUnlock(lppd->hDevMode);
-        HeapFree(GetProcessHeap(), 0, pbuf);
-        HeapFree(GetProcessHeap(), 0, dbuf);
-        bRet = TRUE;
+        WARN("Can't find default printer\n");
+        COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN);
+        return FALSE;
+    }
+
+    GetPrinterA(hprn, 2, NULL, 0, &needed);
+    pbuf = HeapAlloc(GetProcessHeap(), 0, needed);
+    GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed);
+
+    GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
+    dbuf = HeapAlloc(GetProcessHeap(),0,needed);
+    if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
+        ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName);
+        COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
+        return FALSE;
+    }
+    ClosePrinter(hprn);
+
+    PRINTDLG_CreateDevNames(&(lppd->hDevNames),
+                  dbuf->pDriverPath,
+                  pbuf->pPrinterName,
+                  pbuf->pPortName);
+    lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize +
+                     pbuf->pDevMode->dmDriverExtra);
+    ptr = GlobalLock(lppd->hDevMode);
+    memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize +
+           pbuf->pDevMode->dmDriverExtra);
+    GlobalUnlock(lppd->hDevMode);
+    HeapFree(GetProcessHeap(), 0, pbuf);
+    HeapFree(GetProcessHeap(), 0, dbuf);
+    bRet = TRUE;
     } else {
-        HGLOBAL hDlgTmpl;
-        PRINT_PTRA *PrintStructures;
-
-    /* load Dialog resources, 
-     * depending on Flags indicates Print32 or Print32_setup dialog 
+    HGLOBAL hDlgTmpl;
+    PRINT_PTRA *PrintStructures;
+
+    /* load Dialog resources,
+     * depending on Flags indicates Print32 or Print32_setup dialog
      */
-        hDlgTmpl = PRINTDLG_GetDlgTemplate(lppd);
-        if (!hDlgTmpl) {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
-        ptr = LockResource( hDlgTmpl );
-        if (!ptr) {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    hDlgTmpl = PRINTDLG_GetDlgTemplate(lppd);
+    if (!hDlgTmpl) {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
+    ptr = LockResource( hDlgTmpl );
+    if (!ptr) {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
 
         PrintStructures = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-                                    sizeof(PRINT_PTRA));
-        PrintStructures->dlg.lpPrintDlg = lppd;
-
-        /* and create & process the dialog .
-         * -1 is failure, 0 is broken hwnd, everything else is ok.
-         */
-        bRet = (0<DialogBoxIndirectParamA(hInst, ptr, lppd->hwndOwner,
-                                           PrintDlgProcA,
-                                           (LPARAM)PrintStructures));
-
-        if(bRet) {
-            DEVMODEA *lpdm = PrintStructures->lpDevMode, *lpdmReturn;
-            PRINTER_INFO_2A *pi = PrintStructures->lpPrinterInfo;
-            DRIVER_INFO_3A *di = PrintStructures->lpDriverInfo;
-
-            if (lppd->hDevMode == 0) {
-                TRACE(" No hDevMode yet... Need to create my own\n");
-                lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE,
-                                        lpdm->dmSize + lpdm->dmDriverExtra);
-            } else {
-                WORD locks;
-                if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) {
-                    WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
-                    while(locks--) {
-                        GlobalUnlock(lppd->hDevMode);
-                        TRACE("Now got %d locks\n", locks);
-                    }
-                }
-                lppd->hDevMode = GlobalReAlloc(lppd->hDevMode,
-                                               lpdm->dmSize + lpdm->dmDriverExtra,
-                                               GMEM_MOVEABLE);
-            }
-            lpdmReturn = GlobalLock(lppd->hDevMode);
-            memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
-
-            if (lppd->hDevNames != 0) {
-                WORD locks;
-                if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) {
-                    WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
-                    while(locks--)
-                        GlobalUnlock(lppd->hDevNames);
-                }
-            }
-            PRINTDLG_CreateDevNames(&(lppd->hDevNames),
-                    di->pDriverPath,
-                    pi->pPrinterName,
-                    pi->pPortName
-            );
-            GlobalUnlock(lppd->hDevMode);
-        }
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo);
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo);
-        HeapFree(GetProcessHeap(), 0, PrintStructures);
+                    sizeof(PRINT_PTRA));
+    PrintStructures->dlg.lpPrintDlg = lppd;
+
+    /* and create & process the dialog .
+     * -1 is failure, 0 is broken hwnd, everything else is ok.
+     */
+    bRet = (0<DialogBoxIndirectParamA(hInst, ptr, lppd->hwndOwner,
+                       PrintDlgProcA,
+                       (LPARAM)PrintStructures));
+
+    if(bRet) {
+        DEVMODEA *lpdm = PrintStructures->lpDevMode, *lpdmReturn;
+        PRINTER_INFO_2A *pi = PrintStructures->lpPrinterInfo;
+        DRIVER_INFO_3A *di = PrintStructures->lpDriverInfo;
+
+        if (lppd->hDevMode == 0) {
+            TRACE(" No hDevMode yet... Need to create my own\n");
+        lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE,
+                    lpdm->dmSize + lpdm->dmDriverExtra);
+        } else {
+            WORD locks;
+        if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) {
+            WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
+            while(locks--) {
+                GlobalUnlock(lppd->hDevMode);
+            TRACE("Now got %d locks\n", locks);
+            }
+        }
+        lppd->hDevMode = GlobalReAlloc(lppd->hDevMode,
+                           lpdm->dmSize + lpdm->dmDriverExtra,
+                           GMEM_MOVEABLE);
+        }
+        lpdmReturn = GlobalLock(lppd->hDevMode);
+        memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
+
+        if (lppd->hDevNames != 0) {
+            WORD locks;
+        if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) {
+            WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
+            while(locks--)
+                GlobalUnlock(lppd->hDevNames);
+        }
+        }
+        PRINTDLG_CreateDevNames(&(lppd->hDevNames),
+            di->pDriverPath,
+            pi->pPrinterName,
+            pi->pPortName
+        );
+        GlobalUnlock(lppd->hDevMode);
+    }
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo);
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo);
+    HeapFree(GetProcessHeap(), 0, PrintStructures);
     }
     if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC))
         bRet = PRINTDLG_CreateDC(lppd);
 
-    TRACE("exit! (%d)\n", bRet);        
-    return bRet;    
+    TRACE("exit! (%d)\n", bRet);
+    return bRet;
 }
 
@@ -1594 +1595 @@
 /***********************************************************************
  *           PrintDlg   (COMMDLG.20)
- * 
+ *
  *  Displays the the PRINT dialog box, which enables the user to specify
  *  specific properties of the print job.
@@ -1608 +1609 @@
 
 BOOL16 WINAPI PrintDlg16(
-              LPPRINTDLG16 lppd /* [in/out] ptr to PRINTDLG struct */
+          LPPRINTDLG16 lppd /* [in/out] ptr to PRINTDLG struct */
 ) {
     BOOL      bRet = FALSE;
@@ -1616 +1617 @@
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-        struct pd_flags *pflag = pd_flags;
-        for( ; pflag->name; pflag++) {
-            if(lppd->Flags & pflag->flag)
-                strcat(flagstr, pflag->name);
-        }
-        TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
-              "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
-              "flags %08lx (%s)\n",
-              lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
-              lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
-              lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
+    struct pd_flags *pflag = pd_flags;
+    for( ; pflag->name; pflag++) {
+        if(lppd->Flags & pflag->flag)
+            strcat(flagstr, pflag->name);
+    }
+    TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
+          "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
+          "flags %08lx (%s)\n",
+          lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
+          lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
+          lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
     }
 
     if(lppd->lStructSize != sizeof(PRINTDLG16)) {
         ERR("structure size (%ld/%d)\n",lppd->lStructSize,sizeof(PRINTDLG16));
-        COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
-        return FALSE;
+    COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
+    return FALSE;
     }
 
     if(lppd->Flags & PD_RETURNDEFAULT) {
         PRINTER_INFO_2A *pbuf;
-        DRIVER_INFO_3A  *dbuf;
-        HANDLE hprn;
-        DWORD needed;
-
-        if(lppd->hDevMode || lppd->hDevNames) {
-            WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n");
-            COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); 
-            return FALSE;
-        }
+    DRIVER_INFO_3A  *dbuf;
+    HANDLE hprn;
+    DWORD needed;
+
+    if(lppd->hDevMode || lppd->hDevNames) {
+        WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n");
+        COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
+        return FALSE;
+    }
         if(!PRINTDLG_OpenDefaultPrinter(&hprn)) {
-            WARN("Can't find default printer\n");
-            COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN); 
-            return FALSE;
-        }
-
-        GetPrinterA(hprn, 2, NULL, 0, &needed);
-        pbuf = HeapAlloc(GetProcessHeap(), 0, needed);
-        GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed);
-        GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
-        dbuf = HeapAlloc(GetProcessHeap(),0,needed);
-        if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-            ERR("GetPrinterDriverA failed for %s, le %ld, fix your config!\n",
-                    pbuf->pPrinterName,GetLastError());
-            COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); 
-            return FALSE;
-        }
-        ClosePrinter(hprn);
-        PRINTDLG_CreateDevNames16(&(lppd->hDevNames),
-                                dbuf->pDriverPath,
-                                pbuf->pPrinterName,
-                                pbuf->pPortName);
-        lppd->hDevMode = GlobalAlloc16(GMEM_MOVEABLE,pbuf->pDevMode->dmSize+
-                                     pbuf->pDevMode->dmDriverExtra);
-        ptr = GlobalLock16(lppd->hDevMode);
-        memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize +
-               pbuf->pDevMode->dmDriverExtra);
-        GlobalUnlock16(lppd->hDevMode);
-        HeapFree(GetProcessHeap(), 0, pbuf);
-        HeapFree(GetProcessHeap(), 0, dbuf);
-        bRet = TRUE;
+        WARN("Can't find default printer\n");
+        COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN);
+        return FALSE;
+    }
+
+    GetPrinterA(hprn, 2, NULL, 0, &needed);
+    pbuf = HeapAlloc(GetProcessHeap(), 0, needed);
+    GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed);
+    GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
+    dbuf = HeapAlloc(GetProcessHeap(),0,needed);
+    if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
+        ERR("GetPrinterDriverA failed for %s, le %ld, fix your config!\n",
+            pbuf->pPrinterName,GetLastError());
+        COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
+        return FALSE;
+    }
+    ClosePrinter(hprn);
+    PRINTDLG_CreateDevNames16(&(lppd->hDevNames),
+                dbuf->pDriverPath,
+                pbuf->pPrinterName,
+                pbuf->pPortName);
+    lppd->hDevMode = GlobalAlloc16(GMEM_MOVEABLE,pbuf->pDevMode->dmSize+
+                     pbuf->pDevMode->dmDriverExtra);
+    ptr = GlobalLock16(lppd->hDevMode);
+    memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize +
+           pbuf->pDevMode->dmDriverExtra);
+    GlobalUnlock16(lppd->hDevMode);
+    HeapFree(GetProcessHeap(), 0, pbuf);
+    HeapFree(GetProcessHeap(), 0, dbuf);
+    bRet = TRUE;
     } else {
-        HGLOBAL hDlgTmpl;
-        PRINT_PTRA *PrintStructures;
-
-    /* load Dialog resources, 
-     * depending on Flags indicates Print32 or Print32_setup dialog 
+    HGLOBAL hDlgTmpl;
+    PRINT_PTRA *PrintStructures;
+
+    /* load Dialog resources,
+     * depending on Flags indicates Print32 or Print32_setup dialog
      */
-        hDlgTmpl = PRINTDLG_GetDlgTemplate16(lppd);
-        if (!hDlgTmpl) {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
+    hDlgTmpl = PRINTDLG_GetDlgTemplate16(lppd);
+    if (!hDlgTmpl) {
+        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+        return FALSE;
+    }
         PrintStructures = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-                                    sizeof(PRINT_PTRA));
-        PrintStructures->dlg.lpPrintDlg16 = lppd;
-        PrintStructures->dlg.lpPrintDlg = (LPPRINTDLGA)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(PRINTDLGA));
-#define CVAL(x) PrintStructures->dlg.lpPrintDlg->x = lppd->x;
-#define MVAL(x) PrintStructures->dlg.lpPrintDlg->x = MapSL(lppd->x);
-        CVAL(Flags);CVAL(hwndOwner);CVAL(hDC);
-        CVAL(nFromPage);CVAL(nToPage);CVAL(nMinPage);CVAL(nMaxPage);
-        CVAL(nCopies);CVAL(hInstance);CVAL(lCustData);
-        MVAL(lpPrintTemplateName);MVAL(lpSetupTemplateName);
-        /* Don't copy rest, it is 16 bit specific */
+                    sizeof(PRINT_PTRA));
+    PrintStructures->dlg.lpPrintDlg16 = lppd;
+    PrintStructures->dlg.lpPrintDlg = (LPPRINTDLGA)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(PRINTDLGA));
+#define CVAL(x) PrintStructures->dlg.lpPrintDlg->x = lppd->x;
+#define MVAL(x) PrintStructures->dlg.lpPrintDlg->x = MapSL(lppd->x);
+    CVAL(Flags);CVAL(hwndOwner);CVAL(hDC);
+    CVAL(nFromPage);CVAL(nToPage);CVAL(nMinPage);CVAL(nMaxPage);
+    CVAL(nCopies);CVAL(hInstance);CVAL(lCustData);
+    MVAL(lpPrintTemplateName);MVAL(lpSetupTemplateName);
+    /* Don't copy rest, it is 16 bit specific */
 #undef MVAL
 #undef CVAL
 
-        PrintStructures->lpDevMode = HeapAlloc(GetProcessHeap(),0,sizeof(DEVMODEA));
-
-        /* and create & process the dialog .
-         * -1 is failure, 0 is broken hwnd, everything else is ok.
-         */
-        bRet =  (0<DialogBoxIndirectParam16(
-                 hInst, hDlgTmpl, lppd->hwndOwner,
-                 (DLGPROC16)GetProcAddress16(GetModuleHandle16("COMMDLG"),(LPCSTR)21),
-                 (LPARAM)PrintStructures
-                )
-        );
-        if (!PrintStructures->lpPrinterInfo) bRet = FALSE;
-        if(bRet) {
-            DEVMODEA *lpdm = PrintStructures->lpDevMode, *lpdmReturn;
-            PRINTER_INFO_2A *pi = PrintStructures->lpPrinterInfo;
-            DRIVER_INFO_3A *di = PrintStructures->lpDriverInfo;
-
-            if (lppd->hDevMode == 0) {
-                TRACE(" No hDevMode yet... Need to create my own\n");
-                lppd->hDevMode = GlobalAlloc16(GMEM_MOVEABLE,
-                                        lpdm->dmSize + lpdm->dmDriverExtra);
-            } else {
-                WORD locks;
-                if((locks = (GlobalFlags16(lppd->hDevMode)&GMEM_LOCKCOUNT))) {
-                    WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
-                    while(locks--) {
-                        GlobalUnlock16(lppd->hDevMode);
-                        TRACE("Now got %d locks\n", locks);
-                    }
-                }
-                lppd->hDevMode = GlobalReAlloc16(lppd->hDevMode,
-                                               lpdm->dmSize + lpdm->dmDriverExtra,
-                                               GMEM_MOVEABLE);
-            }
-            lpdmReturn = GlobalLock16(lppd->hDevMode);
-            memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
-
-            if (lppd->hDevNames != 0) {
-                WORD locks;
-                if((locks = (GlobalFlags16(lppd->hDevNames)&GMEM_LOCKCOUNT))) {
-                    WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
-                    while(locks--)
-                        GlobalUnlock16(lppd->hDevNames);
-                }
-            }
-            PRINTDLG_CreateDevNames16(&(lppd->hDevNames),
-                    di->pDriverPath,
-                    pi->pPrinterName,
-                    pi->pPortName
-            );
-            GlobalUnlock16(lppd->hDevMode);
-        }
-        if (!(lppd->Flags & (PD_ENABLESETUPTEMPLATEHANDLE | PD_ENABLESETUPTEMPLATE)))
+    PrintStructures->lpDevMode = HeapAlloc(GetProcessHeap(),0,sizeof(DEVMODEA));
+
+    /* and create & process the dialog .
+     * -1 is failure, 0 is broken hwnd, everything else is ok.
+     */
+    bRet =  (0<DialogBoxIndirectParam16(
+         hInst, hDlgTmpl, lppd->hwndOwner,
+         (DLGPROC16)GetProcAddress16(GetModuleHandle16("COMMDLG"),(LPCSTR)21),
+         (LPARAM)PrintStructures
+        )
+    );
+    if (!PrintStructures->lpPrinterInfo) bRet = FALSE;
+    if(bRet) {
+        DEVMODEA *lpdm = PrintStructures->lpDevMode, *lpdmReturn;
+        PRINTER_INFO_2A *pi = PrintStructures->lpPrinterInfo;
+        DRIVER_INFO_3A *di = PrintStructures->lpDriverInfo;
+
+        if (lppd->hDevMode == 0) {
+            TRACE(" No hDevMode yet... Need to create my own\n");
+        lppd->hDevMode = GlobalAlloc16(GMEM_MOVEABLE,
+                    lpdm->dmSize + lpdm->dmDriverExtra);
+        } else {
+            WORD locks;
+        if((locks = (GlobalFlags16(lppd->hDevMode)&GMEM_LOCKCOUNT))) {
+            WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
+            while(locks--) {
+                GlobalUnlock16(lppd->hDevMode);
+            TRACE("Now got %d locks\n", locks);
+            }
+        }
+        lppd->hDevMode = GlobalReAlloc16(lppd->hDevMode,
+                           lpdm->dmSize + lpdm->dmDriverExtra,
+                           GMEM_MOVEABLE);
+        }
+        lpdmReturn = GlobalLock16(lppd->hDevMode);
+        memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
+
+        if (lppd->hDevNames != 0) {
+            WORD locks;
+        if((locks = (GlobalFlags16(lppd->hDevNames)&GMEM_LOCKCOUNT))) {
+            WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
+            while(locks--)
+                GlobalUnlock16(lppd->hDevNames);
+        }
+        }
+        PRINTDLG_CreateDevNames16(&(lppd->hDevNames),
+            di->pDriverPath,
+            pi->pPrinterName,
+            pi->pPortName
+        );
+        GlobalUnlock16(lppd->hDevMode);
+    }
+    if (!(lppd->Flags & (PD_ENABLESETUPTEMPLATEHANDLE | PD_ENABLESETUPTEMPLATE)))
             GlobalFree16(hDlgTmpl); /* created from the 32 bits resource */
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo);
-        HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo);
-        HeapFree(GetProcessHeap(), 0, PrintStructures);
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo);
+    HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo);
+    HeapFree(GetProcessHeap(), 0, PrintStructures);
     }
     if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC))
         bRet = PRINTDLG_CreateDC16(lppd);
 
-    TRACE("exit! (%d)\n", bRet);        
-    return bRet;    
+    TRACE("exit! (%d)\n", bRet);
+    return bRet;
 }
 #endif
@@ -1798 +1799 @@
 
 typedef struct {
-    LPPAGESETUPDLGA     dlga;
-
-    PRINTDLGA           pdlg;
+    LPPAGESETUPDLGA dlga;
+
+    PRINTDLGA       pdlg;
 } PageSetupData;
 
@@ -1808 +1809 @@
 
     if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATEHANDLE) {
-        hDlgTmpl = lppd->hPageSetupTemplate;
-    } else if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATE) {      
-        hResInfo = FindResourceA(lppd->hInstance,
-                                 lppd->lpPageSetupTemplateName, RT_DIALOGA);
-        hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
+    hDlgTmpl = lppd->hPageSetupTemplate;
+    } else if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATE) {
+    hResInfo = FindResourceA(lppd->hInstance,
+                 lppd->lpPageSetupTemplateName, RT_DIALOGA);
+    hDlgTmpl = LoadResource(lppd->hInstance, hResInfo);
     } else {
-        hResInfo = FindResourceA(COMDLG32_hInstance,(LPCSTR)PAGESETUPDLGORD,RT_DIALOGA);
-        hDlgTmpl = LoadResource(COMDLG32_hInstance,hResInfo);
+    hResInfo = FindResourceA(COMDLG32_hInstance,(LPCSTR)PAGESETUPDLGORD,RT_DIALOGA);
+    hDlgTmpl = LoadResource(COMDLG32_hInstance,hResInfo);
     }
     return hDlgTmpl;
@@ -1823 +1824 @@
 _c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) {
     if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES)
-        return 10*size*10/25.4;
+    return 10*size*10/25.4;
     /* If we don't have a flag, we can choose one. Use millimeters
      * to avoid confusing me
@@ -1836 +1837 @@
 _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) {
     if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES)
-        return size;
+    return size;
     if (dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS)
-        return (size*254)/10;
+    return (size*254)/10;
     /* if we don't have a flag, we can choose one. Use millimeters
      * to avoid confusing me
@@ -1850 +1851 @@
     strcpy(strout,"<undef>");
     if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
-        sprintf(strout,"%.2fmm",(size*1.0)/100.0);
-        return;
+    sprintf(strout,"%.2fmm",(size*1.0)/100.0);
+    return;
     }
     if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
-        sprintf(strout,"%.2fin",(size*1.0)/1000.0);
-        return;
+    sprintf(strout,"%.2fin",(size*1.0)/1000.0);
+    return;
     }
     pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
@@ -1864 +1865 @@
 static DWORD
 _c_str2size(PageSetupData *pda,LPCSTR strin) {
-    float       val;
-    char        rest[200];
+    float   val;
+    char    rest[200];
 
     rest[0]='\0';
     if (!sscanf(strin,"%f%s",&val,rest))
-        return 0;
+    return 0;
 
     if (!strcmp(rest,"in") || !strcmp(rest,"inch")) {
-        if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES)
-            return 1000*val;
-        else
-            return val*25.4*100;
+    if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES)
+        return 1000*val;
+    else
+        return val*25.4*100;
     }
     if (!strcmp(rest,"cm")) { rest[0]='m'; val = val*10.0; }
@@ -1881 +1882 @@
 
     if (!strcmp(rest,"mm")) {
-        if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS)
-            return 100*val;
-        else
-            return 1000.0*val/25.4;
+    if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS)
+        return 100*val;
+    else
+        return 1000.0*val/25.4;
     }
     if (rest[0]=='\0') {
-        /* use application supplied default */
-        if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
-            /* 100*mm */
-            return 100.0*val;
-        }
-        if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
-            /* 1000*inch */
-            return 1000.0*val;
-        }
+    /* use application supplied default */
+    if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
+        /* 100*mm */
+        return 100.0*val;
+    }
+    if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
+        /* 1000*inch */
+        return 1000.0*val;
+    }
     }
     ERR("Did not find a conversion for type '%s'!\n",rest);
@@ -1908 +1909 @@
 static BOOL
 PRINTDLG_PS_UpdateDlgStruct(HWND hDlg, PageSetupData *pda) {
-    DEVNAMES    *dn;
-    DEVMODEA    *dm;
-    LPSTR       devname,portname;
-    char        papername[64];
-    char        buf[200];
-    
+    DEVNAMES    *dn;
+    DEVMODEA    *dm;
+    LPSTR   devname,portname;
+    char    papername[64];
+    char    buf[200];
+
     dn = GlobalLock(pda->pdlg.hDevNames);
     dm = GlobalLock(pda->pdlg.hDevMode);
-    devname     = ((char*)dn)+dn->wDeviceOffset;
-    portname    = ((char*)dn)+dn->wOutputOffset;
+    devname = ((char*)dn)+dn->wDeviceOffset;
+    portname    = ((char*)dn)+dn->wOutputOffset;
     PRINTDLG_SetUpPaperComboBox(hDlg,cmb2,devname,portname,dm);
     PRINTDLG_SetUpPaperComboBox(hDlg,cmb3,devname,portname,dm);
 
     if (GetDlgItemTextA(hDlg,cmb2,papername,sizeof(papername))>0) {
-        PRINTDLG_PaperSize(&(pda->pdlg),papername,&(pda->dlga->ptPaperSize));
-        pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.x);
-        pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.y);
+        PRINTDLG_PaperSize(&(pda->pdlg),papername,&(pda->dlga->ptPaperSize));
+    pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.x);
+    pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.y);
     } else
-        FIXME("could not get dialog text for papersize cmbbox?\n");
+    FIXME("could not get dialog text for papersize cmbbox?\n");
 #define GETVAL(id,val) if (GetDlgItemTextA(hDlg,id,buf,sizeof(buf))>0) { val = _c_str2size(pda,buf); } else { FIXME("could not get dlgitemtexta for %x\n",id); }
     GETVAL(edt4,pda->dlga->rtMargin.left);
@@ -1936 +1937 @@
     /* If we are in landscape, swap x and y of page size */
     if (IsDlgButtonChecked(hDlg, rad2)) {
-        DWORD tmp;
-        tmp = pda->dlga->ptPaperSize.x;
-        pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y;
-        pda->dlga->ptPaperSize.y = tmp;
+    DWORD tmp;
+    tmp = pda->dlga->ptPaperSize.x;
+    pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y;
+    pda->dlga->ptPaperSize.y = tmp;
     }
     GlobalUnlock(pda->pdlg.hDevNames);
@@ -1951 +1952 @@
 static BOOL
 PRINTDLG_PS_ChangePrinter(HWND hDlg, PageSetupData *pda) {
-    DEVNAMES    *dn;
-    DEVMODEA    *dm;
-    LPSTR       devname,portname;
-    
+    DEVNAMES    *dn;
+    DEVMODEA    *dm;
+    LPSTR   devname,portname;
+
     dn = GlobalLock(pda->pdlg.hDevNames);
     dm = GlobalLock(pda->pdlg.hDevMode);
-    devname     = ((char*)dn)+dn->wDeviceOffset;
-    portname    = ((char*)dn)+dn->wOutputOffset;
+    devname = ((char*)dn)+dn->wDeviceOffset;
+    portname    = ((char*)dn)+dn->wOutputOffset;
     PRINTDLG_SetUpPaperComboBox(hDlg,cmb2,devname,portname,dm);
     PRINTDLG_SetUpPaperComboBox(hDlg,cmb3,devname,portname,dm);
@@ -1973 +1974 @@
     case IDOK:
         if (!PRINTDLG_PS_UpdateDlgStruct(hDlg, pda))
-            return(FALSE);
-        EndDialog(hDlg, TRUE);
-        return TRUE ;
+        return(FALSE);
+    EndDialog(hDlg, TRUE);
+    return TRUE ;
 
     case IDCANCEL:
         EndDialog(hDlg, FALSE);
-        return FALSE ;
+    return FALSE ;
 
     case psh3: {
-        pda->pdlg.Flags         = 0;
-        pda->pdlg.hwndOwner     = hDlg;
-        if (PrintDlgA(&(pda->pdlg)))
-            PRINTDLG_PS_ChangePrinter(hDlg,pda);
-        return TRUE;
+    pda->pdlg.Flags     = 0;
+    pda->pdlg.hwndOwner = hDlg;
+    if (PrintDlgA(&(pda->pdlg)))
+        PRINTDLG_PS_ChangePrinter(hDlg,pda);
+    return TRUE;
     }
     }
     FIXME("loword (lparam) %d, wparam 0x%x, lparam %08lx, STUB mostly.\n",
-            LOWORD(lParam),wParam,lParam
+        LOWORD(lParam),wParam,lParam
     );
     return FALSE;
@@ -1999 +2000 @@
 PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    PageSetupData       *pda;
-    BOOL                res = FALSE;
+    PageSetupData   *pda;
+    BOOL        res = FALSE;
 
     if (uMsg==WM_INITDIALOG) {
-        res = TRUE;
+    res = TRUE;
         pda = (PageSetupData*)lParam;
-        SetPropA(hDlg,"__WINE_PAGESETUPDLGDATA",lParam);
-        if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
-            res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
-            if (!res) {
-                FIXME("Setup page hook failed?\n");
-                res = TRUE;
-            }
-        }
-        if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) {
-            FIXME("PagePaintHook not yet implemented!\n");
-        }
-        if (pda->dlga->Flags & PSD_DISABLEPRINTER)
-            EnableWindow(GetDlgItem(hDlg, psh3), FALSE);    
-        if (pda->dlga->Flags & PSD_DISABLEMARGINS) {
-            EnableWindow(GetDlgItem(hDlg, edt4), FALSE);    
-            EnableWindow(GetDlgItem(hDlg, edt5), FALSE);    
-            EnableWindow(GetDlgItem(hDlg, edt6), FALSE);    
-            EnableWindow(GetDlgItem(hDlg, edt7), FALSE);    
-        }
-        /* width larger as height -> landscape */
-        if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
+    SetPropA(hDlg,"__WINE_PAGESETUPDLGDATA",lParam);
+    if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
+        res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
+        if (!res) {
+        FIXME("Setup page hook failed?\n");
+        res = TRUE;
+        }
+    }
+    if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) {
+        FIXME("PagePaintHook not yet implemented!\n");
+    }
+    if (pda->dlga->Flags & PSD_DISABLEPRINTER)
+            EnableWindow(GetDlgItem(hDlg, psh3), FALSE);
+    if (pda->dlga->Flags & PSD_DISABLEMARGINS) {
+            EnableWindow(GetDlgItem(hDlg, edt4), FALSE);
+            EnableWindow(GetDlgItem(hDlg, edt5), FALSE);
+            EnableWindow(GetDlgItem(hDlg, edt6), FALSE);
+            EnableWindow(GetDlgItem(hDlg, edt7), FALSE);
+    }
+    /* width larger as height -> landscape */
+    if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
             CheckRadioButton(hDlg, rad1, rad2, rad2);
-        else /* this is default if papersize is not set */
+    else /* this is default if papersize is not set */
             CheckRadioButton(hDlg, rad1, rad2, rad1);
-        if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {
-            EnableWindow(GetDlgItem(hDlg,rad1),FALSE);
-            EnableWindow(GetDlgItem(hDlg,rad2),FALSE);
-        }
-        /* We fill them out enabled or not */
-        if (pda->dlga->Flags & PSD_MARGINS) {
-            char str[100];
-            _c_size2str(pda,pda->dlga->rtMargin.left,str);
-            SetDlgItemTextA(hDlg,edt4,str);
-            _c_size2str(pda,pda->dlga->rtMargin.top,str);
-            SetDlgItemTextA(hDlg,edt5,str);
-            _c_size2str(pda,pda->dlga->rtMargin.right,str);
-            SetDlgItemTextA(hDlg,edt6,str);
-            _c_size2str(pda,pda->dlga->rtMargin.bottom,str);
-            SetDlgItemTextA(hDlg,edt7,str);
-        } else {
-            /* default is 1 inch */
-            DWORD size = _c_inch2size(pda->dlga,1000);
-            char        str[20];
-            _c_size2str(pda,size,str);
-            SetDlgItemTextA(hDlg,edt4,str);
-            SetDlgItemTextA(hDlg,edt5,str);
-            SetDlgItemTextA(hDlg,edt6,str);
-            SetDlgItemTextA(hDlg,edt7,str);
-        }
-        PRINTDLG_PS_ChangePrinter(hDlg,pda);
-        if (pda->dlga->Flags & PSD_DISABLEPAPER) {
-            EnableWindow(GetDlgItem(hDlg,cmb2),FALSE);
-            EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);
-        }
-        return TRUE;
+    if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {
+        EnableWindow(GetDlgItem(hDlg,rad1),FALSE);
+        EnableWindow(GetDlgItem(hDlg,rad2),FALSE);
+    }
+    /* We fill them out enabled or not */
+    if (pda->dlga->Flags & PSD_MARGINS) {
+        char str[100];
+        _c_size2str(pda,pda->dlga->rtMargin.left,str);
+        SetDlgItemTextA(hDlg,edt4,str);
+        _c_size2str(pda,pda->dlga->rtMargin.top,str);
+        SetDlgItemTextA(hDlg,edt5,str);
+        _c_size2str(pda,pda->dlga->rtMargin.right,str);
+        SetDlgItemTextA(hDlg,edt6,str);
+        _c_size2str(pda,pda->dlga->rtMargin.bottom,str);
+        SetDlgItemTextA(hDlg,edt7,str);
     } else {
-        pda = (PageSetupData*)GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA");
-        if (!pda) {
-            WARN("__WINE_PAGESETUPDLGDATA prop not set?\n");
-            return FALSE;
-        }
-        if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
-            res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
-            if (res) return res;
-        }
+        /* default is 1 inch */
+        DWORD size = _c_inch2size(pda->dlga,1000);
+        char    str[20];
+        _c_size2str(pda,size,str);
+        SetDlgItemTextA(hDlg,edt4,str);
+        SetDlgItemTextA(hDlg,edt5,str);
+        SetDlgItemTextA(hDlg,edt6,str);
+        SetDlgItemTextA(hDlg,edt7,str);
+    }
+    PRINTDLG_PS_ChangePrinter(hDlg,pda);
+    if (pda->dlga->Flags & PSD_DISABLEPAPER) {
+        EnableWindow(GetDlgItem(hDlg,cmb2),FALSE);
+        EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);
+    }
+    return TRUE;
+    } else {
+    pda = (PageSetupData*)GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA");
+    if (!pda) {
+        WARN("__WINE_PAGESETUPDLGDATA prop not set?\n");
+        return FALSE;
+    }
+    if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
+        res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
+        if (res) return res;
+    }
     }
     switch (uMsg) {
@@ -2082 +2083 @@
  */
 BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
-    HGLOBAL             hDlgTmpl;
-    LPVOID              ptr;
-    BOOL                bRet;
-    PageSetupData       *pda;
-    PRINTDLGA           pdlg;
+    HGLOBAL     hDlgTmpl;
+    LPVOID      ptr;
+    BOOL        bRet;
+    PageSetupData   *pda;
+    PRINTDLGA       pdlg;
 
 #ifdef __WIN32OS2__
@@ -2094 +2095 @@
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-        struct pd_flags *pflag = psd_flags;
-        for( ; pflag->name; pflag++) {
-            if(setupdlg->Flags & pflag->flag) {
-                strcat(flagstr, pflag->name);
-                strcat(flagstr, "|");
-            }
-        }
-        TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
-              "hinst %08x, flags %08lx (%s)\n",
-              setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
-              setupdlg->hDevNames, 
-              setupdlg->hInstance, setupdlg->Flags, flagstr);
+    struct pd_flags *pflag = psd_flags;
+    for( ; pflag->name; pflag++) {
+        if(setupdlg->Flags & pflag->flag) {
+            strcat(flagstr, pflag->name);
+            strcat(flagstr, "|");
+        }
+    }
+    TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
+          "hinst %08x, flags %08lx (%s)\n",
+          setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
+          setupdlg->hDevNames,
+          setupdlg->hInstance, setupdlg->Flags, flagstr);
     }
 
     /* First get default printer data, we need it right after that. */
     memset(&pdlg,0,sizeof(pdlg));
-    pdlg.lStructSize    = sizeof(pdlg);
-    pdlg.Flags          = PD_RETURNDEFAULT;
+    pdlg.lStructSize    = sizeof(pdlg);
+    pdlg.Flags      = PD_RETURNDEFAULT;
     bRet = PrintDlgA(&pdlg);
     if (!bRet) return FALSE;
@@ -2117 +2118 @@
     /* short cut exit, just return default values */
     if (setupdlg->Flags & PSD_RETURNDEFAULT) {
-        setupdlg->hDevMode      = pdlg.hDevMode;
-        setupdlg->hDevNames     = pdlg.hDevNames;
-        /* FIXME: Just return "A4" for now. */
-        PRINTDLG_PaperSize(&pdlg,"A4",&setupdlg->ptPaperSize);
-        setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
-        setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
-        return TRUE;
+    setupdlg->hDevMode  = pdlg.hDevMode;
+    setupdlg->hDevNames = pdlg.hDevNames;
+    /* FIXME: Just return "A4" for now. */
+        PRINTDLG_PaperSize(&pdlg,"A4",&setupdlg->ptPaperSize);
+    setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
+    setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
+    return TRUE;
     }
     hDlgTmpl = PRINTDLG_GetPGSTemplate(setupdlg);
     if (!hDlgTmpl) {
-        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-        return FALSE;
+    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+    return FALSE;
     }
     ptr = LockResource( hDlgTmpl );
     if (!ptr) {
-        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-        return FALSE;
+    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+    return FALSE;
     }
     pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda));
@@ -2140 +2141 @@
 
     bRet = (0<DialogBoxIndirectParamA(
-                setupdlg->hInstance,
-                ptr,
-                setupdlg->hwndOwner,
-                PageDlgProcA,
-                (LPARAM)pda)
+        setupdlg->hInstance,
+        ptr,
+        setupdlg->hwndOwner,
+        PageDlgProcA,
+        (LPARAM)pda)
     );
     return bRet;
@@ -2155 +2156 @@
     dprintf(("PageSetupDlgA %x NOT IMPLEMENTED", setupdlg));
 #endif
-        FIXME("(%p), stub!\n",setupdlg);
-        return FALSE;
+    FIXME("(%p), stub!\n",setupdlg);
+    return FALSE;
 }
 
@@ -2175 +2176 @@
 
     if (uMsg!=WM_INITDIALOG) {
-        PrintStructures = (PRINT_PTRA*) GetWindowLongA(hDlg, DWL_USER);   
-        if (!PrintStructures)
-            return FALSE;
+        PrintStructures = (PRINT_PTRA*) GetWindowLongA(hDlg, DWL_USER);
+    if (!PrintStructures)
+        return FALSE;
     } else {
         PrintStructures = (PRINT_PTRA*) lParam;
-        SetWindowLongA(hDlg, DWL_USER, lParam); 
-        res = PRINTDLG_WMInitDialog16(hDlg, wParam, PrintStructures);
-
-        if(PrintStructures->dlg.lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
-            res = CallWindowProc16(
-                (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
-                hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg16
-            );
-        }
-        return res;
-    }
-  
+    SetWindowLongA(hDlg, DWL_USER, lParam);
+    res = PRINTDLG_WMInitDialog16(hDlg, wParam, PrintStructures);
+
     if(PrintStructures->dlg.lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
         res = CallWindowProc16(
-                (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
-                hDlg,uMsg, wParam, lParam
-        );
-        if(LOWORD(res)) return res;
+        (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
+        hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg16
+        );
+    }
+    return res;
+    }
+
+    if(PrintStructures->dlg.lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
+        res = CallWindowProc16(
+        (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
+        hDlg,uMsg, wParam, lParam
+    );
+    if(LOWORD(res)) return res;
     }
 
     switch (uMsg) {
     case WM_COMMAND: {
-         /* We need to map those for the 32bit window procedure, compare
-          * with 32Ato16 mapper in winproc.c
-          */
+     /* We need to map those for the 32bit window procedure, compare
+      * with 32Ato16 mapper in winproc.c
+      */
         return PRINTDLG_WMCommand(
-                hDlg,
-                MAKEWPARAM(wParam,HIWORD(lParam)),
-                LOWORD(lParam),
-                PrintStructures
-        );
+        hDlg,
+        MAKEWPARAM(wParam,HIWORD(lParam)),
+        LOWORD(lParam),
+        PrintStructures
+    );
     }
     case WM_DESTROY:
-        DestroyIcon(PrintStructures->hCollateIcon);
-        DestroyIcon(PrintStructures->hNoCollateIcon);
+    DestroyIcon(PrintStructures->hCollateIcon);
+    DestroyIcon(PrintStructures->hNoCollateIcon);
     /* FIXME: don't forget to delete the paper orientation icons here! */
 
         return FALSE;
-    }    
+    }
     return res;
 }
@@ -2227 +2228 @@
  */
 LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
-                                   LPARAM lParam)
+                   LPARAM lParam)
 {
   switch (wMsg)
@@ -2238 +2239 @@
       switch (wParam) {
       case IDOK:
-        EndDialog(hWnd, TRUE);
-        return(TRUE);
+    EndDialog(hWnd, TRUE);
+    return(TRUE);
       case IDCANCEL:
-        EndDialog(hWnd, FALSE);
-        return(TRUE);
+    EndDialog(hWnd, FALSE);
+    return(TRUE);
       }
       return(FALSE);
@@ -2251 +2252 @@
 
 /***********************************************************************
- *      PrintDlgExA (COMDLG32.@)
+ *  PrintDlgExA (COMDLG32.@)
  */
 HRESULT WINAPI PrintDlgExA(LPVOID lpPrintDlgExA) /* [???] FIXME: LPPRINTDLGEXA */
 {
-        FIXME("stub\n");
-        return E_NOTIMPL;
+    FIXME("stub\n");
+    return E_NOTIMPL;
 }
 /***********************************************************************
- *      PrintDlgExW (COMDLG32.@)
+ *  PrintDlgExW (COMDLG32.@)
  */
 HRESULT WINAPI PrintDlgExW(LPVOID lpPrintDlgExW) /* [???] FIXME: LPPRINTDLGEXW */
 {
-        FIXME("stub\n");
-        return E_NOTIMPL;
-}
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}

trunk/src/crtdll/crtdll.cpp

@@ +1 @@
+/* $Id: crtdll.cpp,v 1.30 2001-09-05 12:14:23 bird Exp $ */
 /*
  * The C RunTime DLL
- * 
+ *
  * Implements C run-time functionality as known from UNIX.
  *
- * TODO: 
+ * TODO:
  *   - Check setjmp(3)
  *   - fix *ALL* functions for the FS: wrapper problem
@@ -72 +73 @@
 // Definitions for internal functions
 //
-void            qsort1 (char*, char*, size_t,
+void        qsort1 (char*, char*, size_t,
                     int (* CDECL)(const void*, const void*));
 
@@ -444 +445 @@
 
 /*********************************************************************
- *      _cscanf                                 (CRTDLL.67)
+ *  _cscanf                     (CRTDLL.67)
  */
 INT CDECL CRTDLL__cscanf( char *s, va_list arg )
@@ -604 +605 @@
 
 /*********************************************************************
- *      _ftime                                  (CRTDLL.112)
+ *  _ftime                  (CRTDLL.112)
  */
 void CDECL CRTDLL__ftime( struct timeb *timebuf )
@@ -618 +619 @@
 LONG CDECL CRTDLL__ftol(void)
 {
-        /* don't just do DO_FPU("fistp",retval), because the rounding
-         * mode must also be set to "round towards zero"... */
-        double fl;
-        POP_FPU(fl);
-        return (LONG)fl;
+    /* don't just do DO_FPU("fistp",retval), because the rounding
+     * mode must also be set to "round towards zero"... */
+    double fl;
+    POP_FPU(fl);
+    return (LONG)fl;
 }
 
@@ -775 +776 @@
 
 /*********************************************************************
- *                  _ltoa       (CRTDLL.179)
+ *                  _ltoa   (CRTDLL.179)
  */
 LPSTR  CDECL CRTDLL__ltoa(long x,LPSTR buf,INT radix)
@@ -784 +785 @@
 
 /*********************************************************************
- *                  _matherr    (CRTDLL.181)
+ *                  _matherr    (CRTDLL.181)
  */
 double CDECL CRTDLL__matherr( struct exception * excep )
@@ -881 +882 @@
 
 /*********************************************************************
- *           CRTDLL__searchenv   (CRTDLL.260)
+ *           CRTDLL__searchenv   (CRTDLL.260)
  */
 void CDECL CRTDLL__searchenv(char *file, char *var,char *path )
@@ -891 +892 @@
 
 /*********************************************************************
- *           CRTDLL__seterrormode        (CRTDLL.261)
+ *           CRTDLL__seterrormode    (CRTDLL.261)
  */
 void CDECL CRTDLL__seterrormode(int uMode)
@@ -902 +903 @@
 
 /*********************************************************************
- *           CRTDLL__setjmp      (CRTDLL.262)
+ *           CRTDLL__setjmp      (CRTDLL.262)
  */
 int CDECL CRTDLL__setjmp( jmp_buf env )
@@ -937 +938 @@
 
 /*********************************************************************
- *      _sopen                                  (CRTDLL.268)
+ *  _sopen                  (CRTDLL.268)
  */
 int CDECL CRTDLL__sopen( const char *s, int i1, int i2, va_list arg )
@@ -947 +948 @@
 
 /*********************************************************************
- *           CRTDLL__spawnl      (CRTDLL.269)
+ *           CRTDLL__spawnl      (CRTDLL.269)
  */
 int CDECL CRTDLL__spawnl(int nMode, char* szPath, char* szArgv0, va_list arg)
@@ -957 +958 @@
 
 /*********************************************************************
- *           CRTDLL__spawnle     (CRTDLL.270)
+ *           CRTDLL__spawnle     (CRTDLL.270)
  */
 int CDECL CRTDLL__spawnle( int mode, char *path, char **szArgv0, va_list arg )
@@ -967 +968 @@
 
 /*********************************************************************
- *           CRTDLL__spawnlp     (CRTDLL.271)
+ *           CRTDLL__spawnlp     (CRTDLL.271)
  */
 int CDECL CRTDLL__spawnlp(int nMode, char* szPath, char* szArgv0, va_list arg)
@@ -977 +978 @@
 
 /*********************************************************************
- *           CRTDLL__spawnlpe    (CRTDLL.272)
+ *           CRTDLL__spawnlpe    (CRTDLL.272)
  */
 int CDECL CRTDLL__spawnlpe( int mode, char *path, char *szArgv0, va_list arg )
@@ -987 +988 @@
 
 /*********************************************************************
- *           CRTDLL__spawnv      (CRTDLL.273)
+ *           CRTDLL__spawnv      (CRTDLL.273)
  */
 int CDECL CRTDLL__spawnv( int i, char *s1, char ** s2 )
@@ -997 +998 @@
 
 /*********************************************************************
- *           CRTDLL__spawnvp     (CRTDLL.275)
+ *           CRTDLL__spawnvp     (CRTDLL.275)
  */
 int CDECL CRTDLL__spawnvp( int i, char *s1, char ** s2 )
@@ -1006 +1007 @@
 
 /*********************************************************************
- *           CRTDLL__spawnv      (CRTDLL.276)
+ *           CRTDLL__spawnv      (CRTDLL.276)
  */
 int CDECL CRTDLL__spawnvpe( int i, char *s1, char ** s2, char ** s3 )
@@ -1016 +1017 @@
 
 /*********************************************************************
- *           CRTDLL__statusfp    (CRTDLL.279)
+ *           CRTDLL__statusfp    (CRTDLL.279)
  */
 unsigned int CDECL CRTDLL__statusfp( void )
@@ -1023 +1024 @@
   return (_status87());
 }
-        
-
-/*********************************************************************
- *           _ultoa              (CRTDLL.309)
+
+
+/*********************************************************************
+ *           _ultoa      (CRTDLL.309)
  */
 LPSTR  CDECL CRTDLL__ultoa(long x,LPSTR buf,INT radix)
@@ -1036 +1037 @@
 
 /*********************************************************************
- *           CRTDLL__ungetch     (CRTDLL.311)
+ *           CRTDLL__ungetch     (CRTDLL.311)
  */
 int CDECL CRTDLL__ungetch( int i )
@@ -1046 +1047 @@
 
 /*********************************************************************
- *           _utime              (CRTDLL.314)
+ *           _utime      (CRTDLL.314)
  */
 int CDECL CRTDLL__utime( char *path, struct utimbuf * times )
@@ -1056 +1057 @@
 
 /*********************************************************************
- *      _vsnprintf                              (CRTDLL.315)
+ *  _vsnprintf              (CRTDLL.315)
  */
 int CDECL CRTDLL__vsnprintf( char *s, size_t bufsize, const char *format, va_list arg )
@@ -1100 +1101 @@
 
 /*********************************************************************
- *                  abs         (CRTDLL.336)
+ *                  abs     (CRTDLL.336)
  */
 double CDECL CRTDLL_abs(double d)
@@ -1112 +1113 @@
 
 /*********************************************************************
- *                  acos        (CRTDLL.337)
+ *                  acos    (CRTDLL.337)
  */
 double CDECL CRTDLL_acos( double x )
@@ -1122 +1123 @@
 
 /*********************************************************************
- *                  asctime     (CRTDLL.338)
+ *                  asctime (CRTDLL.338)
  */
 char * CDECL CRTDLL_asctime( const struct tm *timeptr )
@@ -1132 +1133 @@
 
 /*********************************************************************
- *                  asin        (CRTDLL.339)
+ *                  asin    (CRTDLL.339)
  */
 double CDECL CRTDLL_asin( double x )
@@ -1142 +1143 @@
 
 /*********************************************************************
- *                  atan        (CRTDLL.340)
+ *                  atan    (CRTDLL.340)
  */
 double CDECL CRTDLL_atan(double d)
@@ -1154 +1155 @@
 
 /*********************************************************************
- *                  atan2       (CRTDLL.341)
+ *                  atan2   (CRTDLL.341)
  */
 double CDECL CRTDLL_atan2( double y, double x )
@@ -1164 +1165 @@
 
 /*********************************************************************
- *                  atof        (CRTDLL.343)
+ *                  atof    (CRTDLL.343)
  */
 double CDECL CRTDLL_atof( const char *nptr )
@@ -1174 +1175 @@
 
 /*********************************************************************
- *                  atoi        (CRTDLL.344)
+ *                  atoi    (CRTDLL.344)
  */
 int CDECL CRTDLL_atoi(LPSTR str)
@@ -1186 +1187 @@
 
 /*********************************************************************
- *                  atol        (CRTDLL.345)
+ *                  atol    (CRTDLL.345)
  */
 long CDECL CRTDLL_atol(LPSTR str)
@@ -1198 +1199 @@
 
 /*********************************************************************
- *                  bsearch     (CRTDLL.346)
+ *                  bsearch (CRTDLL.346)
  */
 void *CDECL CRTDLL_bsearch (const void *key, const void *base, size_t num, size_t width,
@@ -1205 +1206 @@
   int left, right, median, sign;
   const void *element;
-  
+
   if (width == 0)
     return 0;
@@ -1226 +1227 @@
 
 /*********************************************************************
- *                  ceil        (CRTDLL.348)
+ *                  ceil    (CRTDLL.348)
  */
 double CDECL CRTDLL_ceil(double d)
@@ -1237 +1238 @@
 
 /*********************************************************************
- *                  clock       (CRTDLL.350)
+ *                  clock   (CRTDLL.350)
  */
 clock_t CDECL CRTDLL_clock( void )
@@ -1247 +1248 @@
 
 /*********************************************************************
- *                  cos         (CRTDLL.351)
+ *                  cos     (CRTDLL.351)
  */
 double CDECL CRTDLL_cos(double d)
@@ -1259 +1260 @@
 
 /*********************************************************************
- *                  cosh        (CRTDLL.352)
+ *                  cosh    (CRTDLL.352)
  */
 double CDECL CRTDLL_cosh( double x )
@@ -1269 +1270 @@
 
 /*********************************************************************
- *                  ctime       (CRTDLL.353)
+ *                  ctime   (CRTDLL.353)
  */
 char * CDECL CRTDLL_ctime( const time_t *timer )
@@ -1279 +1280 @@
 
 /*********************************************************************
- *                  difftime    (CRTDLL.354)
+ *                  difftime    (CRTDLL.354)
  */
 double CDECL CRTDLL_difftime( time_t t1, time_t t0 )
@@ -1289 +1290 @@
 
 /*********************************************************************
- *                  div         (CRTDLL.355)
+ *                  div     (CRTDLL.355)
  */
 ULONG CDECL CRTDLL_div( int number, int denom )
@@ -1303 +1304 @@
 
 /*********************************************************************
- *                  exp         (CRTDLL.357)
+ *                  exp     (CRTDLL.357)
  */
 double CDECL CRTDLL_exp( double x )
@@ -1313 +1314 @@
 
 /*********************************************************************
- *                  fabs        (CRTDLL.358)
+ *                  fabs    (CRTDLL.358)
  */
 double CDECL CRTDLL_fabs(double d)
@@ -1325 +1326 @@
 
 /*********************************************************************
- *                  floor               (CRTDLL.367)
+ *                  floor       (CRTDLL.367)
  */
 double CDECL CRTDLL_floor(double d)
@@ -1337 +1338 @@
 
 /*********************************************************************
- *                  fmod        (CRTDLL.368)
+ *                  fmod    (CRTDLL.368)
  */
 double CDECL CRTDLL_fmod(double x, double y )
@@ -1347 +1348 @@
 
 /*********************************************************************
- *                  frexp         (CRTDLL.377)
+ *                  frexp     (CRTDLL.377)
  */
 double CDECL CRTDLL_frexp( double value, int *exp )
@@ -1489 +1490 @@
 
 /*********************************************************************
- *                  labs        (CRTDLL.416)
+ *                  labs    (CRTDLL.416)
  */
 long int CDECL CRTDLL_labs( long int j )
@@ -1499 +1500 @@
 
 /*********************************************************************
- *                  ldexp       (CRTDLL.417)
- */
-double CDECL CRTDLL_ldexp( double x, int exp ) 
+ *                  ldexp   (CRTDLL.417)
+ */
+double CDECL CRTDLL_ldexp( double x, int exp )
 {
   dprintf2(("CRTDLL: ldexp\n"));
@@ -1509 +1510 @@
 
 /*********************************************************************
- *                  ldiv        (CRTDLL.418)
- */
-ldiv_t CDECL CRTDLL_ldiv( long int numer, long int denom ) 
+ *                  ldiv    (CRTDLL.418)
+ */
+ldiv_t CDECL CRTDLL_ldiv( long int numer, long int denom )
 {
   dprintf2(("CRTDLL: ldiv\n"));
@@ -1519 +1520 @@
 
 /*********************************************************************
- *                  localeconv  (CRTDLL.419)
+ *                  localeconv  (CRTDLL.419)
  */
 struct lconv * CDECL CRTDLL_localeconv(void)
@@ -1529 +1530 @@
 
 /*********************************************************************
- *                  localtime   (CRTDLL.420)
+ *                  localtime   (CRTDLL.420)
  */
 struct tm * CDECL CRTDLL_localtime( const time_t *timer )
@@ -1539 +1540 @@
 
 /*********************************************************************
- *                  log         (CRTDLL.421)
+ *                  log     (CRTDLL.421)
  */
 double CDECL CRTDLL_log( double x )
@@ -1549 +1550 @@
 
 /*********************************************************************
- *                  log10       (CRTDLL.422)
+ *                  log10   (CRTDLL.422)
  */
 double CDECL CRTDLL_log10( double x )
@@ -1581 +1582 @@
  *                  pow      (CRTDLL.436)
  */
-double CDECL CRTDLL_pow( double x, double y )   
+double CDECL CRTDLL_pow( double x, double y )
 {
     dprintf2(("CRTDLL: pow(%08xh, %08xh)\n",x, y));
@@ -1621 +1622 @@
 
 /*********************************************************************
- *      scanf                                   (CRTDLL.448)
+ *  scanf                   (CRTDLL.448)
  */
 int CDECL CRTDLL_scanf( const char *format, va_list arg )
@@ -1705 +1706 @@
 
 /*********************************************************************
- *      sscanf                                  (CRTDLL.458)
+ *  sscanf                  (CRTDLL.458)
  */
 int CDECL CRTDLL_sscanf( const char *s, const char *format, va_list arg )
@@ -1782 +1783 @@
 
 /*********************************************************************
- *      ungetc                                  (CRTDLL.492)
+ *  ungetc                  (CRTDLL.492)
  */
 INT CDECL CRTDLL_ungetc(int c, FILE *f)
@@ -1812 +1813 @@
 
 /*********************************************************************
- *           CRTDLL__setjmp3     (CRTDLL.600)
+ *           CRTDLL__setjmp3     (CRTDLL.600)
  */
 int CDECL CRTDLL__setjmp3( jmp_buf env )

trunk/src/crtdll/crtdll_main.c

@@ +1 @@
+/* $Id: crtdll_main.c,v 1.2 2001-09-05 12:14:24 bird Exp $ */
 /*
  * The C RunTime DLL
- * 
+ *
  * Implements C run-time functionality as known from UNIX.
  *
@@ -13 +14 @@
 Unresolved issues Uwe Bonnes 970904:
 - tested with ftp://ftp.remcomp.com/pub/remcomp/lcc-win32.zip, a C-Compiler
-                for Win32, based on lcc, from Jacob Navia
+        for Win32, based on lcc, from Jacob Navia
 UB 000416:
 - probably not thread safe
 */
 
-/* NOTE: This file also implements the wcs* functions. They _ARE_ in 
+/* NOTE: This file also implements the wcs* functions. They _ARE_ in
  * the newer Linux libcs, but use 4 byte wide characters, so are unusable,
  * since we need 2 byte wide characters. - Marcus Meissner, 981031
@@ -63 +64 @@
 UINT CRTDLL_winminor_dll;     /* CRTDLL.330 */
 UINT CRTDLL_winver_dll;       /* CRTDLL.331 */
-INT  CRTDLL_doserrno = 0; 
+INT  CRTDLL_doserrno = 0;
 INT  CRTDLL_errno = 0;
 const INT  CRTDLL__sys_nerr = 43;
@@ -77 +78 @@
  *                  CRTDLL_MainInit  (CRTDLL.init)
  */
- 
+
 BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   FS_OS2
-    
+
     // call i/o initializer in file.c
-    if (fdwReason == DLL_PROCESS_ATTACH) 
+    if (fdwReason == DLL_PROCESS_ATTACH)
     {
       __CRTDLL__init_io();
     }
-    
+
   /*
     PH 2000/11/21 this code doesn't look very useful
-    
+
     if (fdwReason == DLL_PROCESS_ATTACH) {
       _fdopen(0,"r");
@@ -103 +104 @@
       }
   */
-  
+
   FS_WIN32
   return TRUE;
@@ -176 +177 @@
         char *cmdline;
         char  **xargv;
-        int     xargc,end,last_arg,afterlastspace;
-        DWORD   version;
-
-        TRACE("(%p,%p,%p,%ld).\n",
-                argc,argv,environ,flag
-        );
-
-        if (CRTDLL_acmdln_dll != NULL)
-                HeapFree(GetProcessHeap(), 0, CRTDLL_acmdln_dll);
-
-        CRTDLL_acmdln_dll = cmdline = CRTDLL__strdup( GetCommandLineA() );
-        TRACE("got '%s'\n", cmdline);
-
-        version = GetVersion();
-        CRTDLL_osver_dll       = version >> 16;
-        CRTDLL_winminor_dll    = version & 0xFF;
-        CRTDLL_winmajor_dll    = (version>>8) & 0xFF;
-        CRTDLL_baseversion_dll = version >> 16;
-        CRTDLL_winver_dll      = ((version >> 8) & 0xFF) + ((version & 0xFF) << 8);
-        CRTDLL_baseminor_dll   = (version >> 16) & 0xFF;
-        CRTDLL_basemajor_dll   = (version >> 24) & 0xFF;
-        CRTDLL_osversion_dll   = version & 0xFFFF;
-        CRTDLL_osminor_dll     = version & 0xFF;
-        CRTDLL_osmajor_dll     = (version>>8) & 0xFF;
-
-        /* missing threading init */
-
-        end=0;last_arg=0;xargv=NULL;xargc=0;afterlastspace=0;
-        while (1)
-        {
-            if ((cmdline[end]==' ') || (cmdline[end]=='\0'))
-            {
-                if (cmdline[end]=='\0')
-                    last_arg=1;
-                else
-                    cmdline[end]='\0';
-                /* alloc xargc + NULL entry */
-                        xargv=(char**)HeapReAlloc( GetProcessHeap(), 0, xargv,
-                                             sizeof(char*)*(xargc+1));
-                if (strlen(cmdline+afterlastspace))
-                {
-                    xargv[xargc] = CRTDLL__strdup(cmdline+afterlastspace);
-                    xargc++;
+    int xargc,end,last_arg,afterlastspace;
+    DWORD   version;
+
+    TRACE("(%p,%p,%p,%ld).\n",
+        argc,argv,environ,flag
+    );
+
+    if (CRTDLL_acmdln_dll != NULL)
+        HeapFree(GetProcessHeap(), 0, CRTDLL_acmdln_dll);
+
+    CRTDLL_acmdln_dll = cmdline = CRTDLL__strdup( GetCommandLineA() );
+    TRACE("got '%s'\n", cmdline);
+
+    version = GetVersion();
+    CRTDLL_osver_dll       = version >> 16;
+    CRTDLL_winminor_dll    = version & 0xFF;
+    CRTDLL_winmajor_dll    = (version>>8) & 0xFF;
+    CRTDLL_baseversion_dll = version >> 16;
+    CRTDLL_winver_dll      = ((version >> 8) & 0xFF) + ((version & 0xFF) << 8);
+    CRTDLL_baseminor_dll   = (version >> 16) & 0xFF;
+    CRTDLL_basemajor_dll   = (version >> 24) & 0xFF;
+    CRTDLL_osversion_dll   = version & 0xFFFF;
+    CRTDLL_osminor_dll     = version & 0xFF;
+    CRTDLL_osmajor_dll     = (version>>8) & 0xFF;
+
+    /* missing threading init */
+
+    end=0;last_arg=0;xargv=NULL;xargc=0;afterlastspace=0;
+    while (1)
+    {
+        if ((cmdline[end]==' ') || (cmdline[end]=='\0'))
+        {
+        if (cmdline[end]=='\0')
+            last_arg=1;
+        else
+            cmdline[end]='\0';
+        /* alloc xargc + NULL entry */
+            xargv=(char**)HeapReAlloc( GetProcessHeap(), 0, xargv,
+                                     sizeof(char*)*(xargc+1));
+        if (strlen(cmdline+afterlastspace))
+        {
+            xargv[xargc] = CRTDLL__strdup(cmdline+afterlastspace);
+            xargc++;
                     if (!last_arg) /* need to seek to the next arg ? */
-                    {
-                        end++;
-                        while (cmdline[end]==' ')
-                            end++;
-        }
-                    afterlastspace=end;
-                }
-                else
-                {
-                    xargv[xargc] = NULL; /* the last entry is NULL */
-                    break;
-                }
-            }
-            else
-                end++;
-        }
-        CRTDLL_argc_dll = xargc;
-        *argc           = xargc;
-        CRTDLL_argv_dll = xargv;
-        *argv           = xargv;
-
-        TRACE("found %d arguments\n",
-                CRTDLL_argc_dll);
-        CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
-        return environ;
+            {
+            end++;
+            while (cmdline[end]==' ')
+                end++;
+    }
+            afterlastspace=end;
+        }
+        else
+        {
+            xargv[xargc] = NULL; /* the last entry is NULL */
+            break;
+        }
+        }
+        else
+        end++;
+    }
+    CRTDLL_argc_dll = xargc;
+    *argc       = xargc;
+    CRTDLL_argv_dll = xargv;
+    *argv       = xargv;
+
+    TRACE("found %d arguments\n",
+        CRTDLL_argc_dll);
+    CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
+    return environ;
 }
 
@@ -253 +254 @@
 DWORD CDECL CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
 {
-        _INITTERMFUN    *current;
-
-        TRACE("(%p,%p)\n",start,end);
-        current=start;
-        while (current<end) {
-                if (*current) (*current)();
-                current++;
-        }
-        return 0;
+    _INITTERMFUN    *current;
+
+    TRACE("(%p,%p)\n",start,end);
+    current=start;
+    while (current<end) {
+        if (*current) (*current)();
+        current++;
+    }
+    return 0;
 }
 
@@ -309 +310 @@
 INT CDECL CRTDLL_rand()
 {
-    return (rand() & CRTDLL_RAND_MAX); 
+    return (rand() & CRTDLL_RAND_MAX);
 }
 
@@ -319 +320 @@
 {
   // return (_rotl(value, shift));
-  
+
     shift &= 31;
     return (x << shift) | (x >> (32-shift));
@@ -331 +332 @@
 {
   // return (_lrotl(value, shift));
-  
+
     shift &= 31;
     return (x << shift) | (x >> (32-shift));
@@ -343 +344 @@
 {
   // return (_lrotr(value, shift));
-  
+
     shift &= 0x1f;
     return (x >> shift) | (x << (32-shift));
@@ -355 +356 @@
 {
   // return (_rotr(value, shift));
-  
+
     shift &= 0x1f;
     return (x >> shift) | (x << (32-shift));
@@ -367 +368 @@
 {
   // return (vswprintf(s, t, format, arg));
-  
+
     return wvsprintfW( buffer, spec, args );
 }
@@ -388 +389 @@
 {
   return (setlocale(category, locale));
-  
+
   /*
     LPSTR categorystr;
@@ -437 +438 @@
 {
   // return (_fullpath(buf, path, size));
-  
+
   if (!buf)
   {
@@ -455 +456 @@
 {
   // _splitpath( path, drive, dir, fname, ext);
-  
+
   /* drive includes :
      directory includes leading and trailing (forward and backward slashes)
@@ -519 +520 @@
 {
   // _makepath(path, drive, dir, fname, ext);
-  
+
     char ch;
     TRACE("CRTDLL__makepath got %s %s %s %s\n", drive, directory,
@@ -567 +568 @@
 {
   // return (_errno());
-  
+
   return &CRTDLL_errno;
 }
@@ -574 +575 @@
 /*********************************************************************
  *                  __doserrno       (CRTDLL.26)
- * 
+ *
  * Return the address of the DOS errno (holding the last OS error).
  * @@@PH Note: veeeery strange ...
@@ -583 +584 @@
 {
   // return (__doserrno());
-  
+
   return &CRTDLL_doserrno;
 }
@@ -601 +602 @@
 {
   // return (_strerror((char*)s));
-  
+
   static char strerrbuff[256];
   sprintf(strerrbuff,"%s: %s\n",err,CRTDLL_strerror(CRTDLL_errno));
@@ -616 +617 @@
 {
   // perror( s );
-  
+
   char *err_str = CRTDLL_strerror(CRTDLL_errno);
   CRTDLL_fprintf(CRTDLL_stderr,"%s: %s\n",err,err_str);
   CRTDLL_free(err_str);
 }
- 
+
 
 /*********************************************************************
@@ -631 +632 @@
  * The caller does not own the string returned.
  */
-extern char *strerror(int errnum); 
+extern char *strerror(int errnum);
 
 LPSTR CDECL CRTDLL_strerror (INT err)
@@ -645 +646 @@
 {
   //return (signal(sig, ptr));
-  
+
   FIXME("(%d %p):stub.\n", sig, ptr);
   return (void*)-1;
@@ -667 +668 @@
 {
   // return (getenv(name));
-  
+
      LPSTR environ = GetEnvironmentStringsA();
      LPSTR pp,pos = NULL;
@@ -674 +675 @@
      for (pp = environ; (*pp); pp = pp + strlen(pp) +1)
        {
-         pos =strchr(pp,'=');
-         if (pos)
-           length = pos -pp;
-         else
-           length = strlen(pp);
-         if (!strncmp(pp,name,length)) break;
+     pos =strchr(pp,'=');
+     if (pos)
+       length = pos -pp;
+     else
+       length = strlen(pp);
+     if (!strncmp(pp,name,length)) break;
        }
-     if ((pp)&& (pos)) 
+     if ((pp)&& (pos))
        {
-         pp = pos+1;
-         TRACE("got %s\n",pp);
+     pp = pos+1;
+     TRACE("got %s\n",pp);
        }
      FreeEnvironmentStringsA( environ );
@@ -695 +696 @@
  */
 INT CDECL CRTDLL__except_handler2 (
-        PEXCEPTION_RECORD rec,
-        PEXCEPTION_FRAME frame,
-        PCONTEXT context,
-        PEXCEPTION_FRAME  *dispatcher)
-{
-        FIXME ("exception %lx flags=%lx at %p handler=%p %p %p stub\n",
-        rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
-        frame->Handler, context, dispatcher);
-        return ExceptionContinueSearch;
+    PEXCEPTION_RECORD rec,
+    PEXCEPTION_FRAME frame,
+    PCONTEXT context,
+    PEXCEPTION_FRAME  *dispatcher)
+{
+    FIXME ("exception %lx flags=%lx at %p handler=%p %p %p stub\n",
+    rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
+    frame->Handler, context, dispatcher);
+    return ExceptionContinueSearch;
 }
 
@@ -724 +725 @@
 {
   // return (_toascii(c));
-  
+
   return c & 0x7f;
 }
@@ -754 +755 @@
 {
   // return (_iscsym(c));
-  
+
   return (isalnum(c) || c == '_');
 }
@@ -773 +774 @@
 {
   // return (_iscsymf(c));
-  
+
   return (isalpha(c) || c == '_');
 }
@@ -846 +847 @@
     {
       if (cf((LPVOID*)match, (LPVOID*)pStart) == 0)
-        return pStart; /* found */
+    return pStart; /* found */
       pStart += elem_size;
     } while (--size);
@@ -914 +915 @@
 {
   // return (_toupper(n));
-  
+
   return toupper(c);
 }
@@ -925 +926 @@
 {
   // return (_tolower(n));
-  
+
   return tolower(c);
 }
@@ -946 +947 @@
 {
   // return (_cabs(c));
-  
+
   return sqrt(c.real * c.real + c.imaginary * c.imaginary);
 }
@@ -1006 +1007 @@
  *
  * Reset the state of the floating point processor.
- * 
+ *
  * PARAMS
  *   None.

trunk/src/crtdll/dir.c

@@ +1 @@
+/* $Id: dir.c,v 1.5 2001-09-05 12:14:24 bird Exp $ */
 /*
  * CRTDLL drive/directory functions
- * 
+ *
  * Copyright 1996,1998 Marcus Meissner
  * Copyright 1996 Jukka Iivonen
@@ -57 +58 @@
  * RETURNS
  * Sucess:  0
- * 
+ *
  * Failure: -1
  */
@@ -64 +65 @@
   dprintf(("CRTDLL: _chdir(%s)\n",
           newdir));
-  
+
   if (!SetCurrentDirectoryA(newdir))
   {
@@ -84 +85 @@
  * RETURNS
  * Sucess:  0
- * 
- * Failure: 1 
+ *
+ * Failure: 1
  */
 BOOL CDECL CRTDLL__chdrive(INT newdrive)
@@ -91 +92 @@
   char buffer[3] = "A:";
   buffer[0] += newdrive - 1;
-  
+
   dprintf(("CRTDLL: _chdrive(%s)\n",
           buffer));
-  
+
   if (!SetCurrentDirectoryA( buffer ))
   {
@@ -108 +109 @@
 /*********************************************************************
  *                  _findclose     (CRTDLL.098)
- * 
+ *
  * Free the resources from a search handle created from _findfirst.
  *
@@ -123 +124 @@
   dprintf(("CRTDLL: _findclose(%08xh)\n",
           hand));
-  
+
   if (!FindClose((HANDLE)hand))
   {
@@ -141 +142 @@
  * PARAMS
  *   fspec [in]  File specification string for search, e.g "C:\*.BAT"
- * 
+ *
  *   ft [out]    A pointer to a find_t structure to populate.
  *
@@ -155 +156 @@
   WIN32_FIND_DATAA find_data;
   HANDLE hfind;
-  
+
   dprintf(("CRTDLL: _findfirst(%s)\n",
           fspec));
@@ -173 +174 @@
 /*********************************************************************
  *                  _findnext     (CRTDLL.100)
- * 
+ *
  * Return the next matching file/directory from a search hadle.
  *
  * PARAMS
  *   hand [in] Search handle from a pervious call to _findfirst
- * 
+ *
  *   ft [out]  A pointer to a find_t structure to populate.
  *
@@ -190 +191 @@
 {
   WIN32_FIND_DATAA find_data;
-  
+
   dprintf(("CRTDLL: _findnext(%08xh)\n",
           hand));
-  
+
   if (!FindNextFileA(hand, &find_data))
   {
@@ -224 +225 @@
 {
   // return (_getcwd(buf, size));
-  
+
   char dir[_MAX_PATH];
   int dir_len = GetCurrentDirectoryA(_MAX_PATH,dir);
-  
+
   dprintf(("CRTDLL: _getcwd()\n"));
-  
+
   if (dir_len < 1)
     return NULL; /* FIXME: Real return value untested */
@@ -258 +259 @@
 {
   // return (_getdcwd(drive, buffer, maxlen));
-  
+
   static CHAR* dummy;
-  
+
   dprintf(("CRTDLL: _getdcwd()\n"));
-  
+
   if (!drive || drive == CRTDLL__getdrive())
     return CRTDLL__getcwd(buf,size); /* current */
@@ -305 +306 @@
   DWORD ret[4];
   UINT err;
-  
+
   dprintf(("CRTDLL: _getdiskfree(%08xh)\n", disk));
-  
+
   if (disk > 26)
     return ERROR_INVALID_PARAMETER; /* CRTDLL doesn't set errno here */
@@ -335 +336 @@
 {
   // return DRIVE_GetCurrentDrive() + 1;
-  
+
   char buffer[MAX_PATH];
-  
+
   dprintf(("CRTDLL: _getdrive()\n"));
 
-  if (!GetCurrentDirectoryA( sizeof(buffer), buffer )) 
-    return 0;
-  if (buffer[1] != ':') 
+  if (!GetCurrentDirectoryA( sizeof(buffer), buffer ))
+    return 0;
+  if (buffer[1] != ':')
     return 0;
   return toupper(buffer[0]) - 'A' + 1;
@@ -357 +358 @@
   dprintf(("CRTDLL: _mkdir(%s)\n",
           newdir));
-  
+
   if (CreateDirectoryA(newdir,NULL))
     return 0;
@@ -368 +369 @@
  *                  _rmdir           (CRTDLL.255)
  *
- * Delete a directory 
+ * Delete a directory
  *
  */
@@ -375 +376 @@
   dprintf(("CRTDLL: _rmdir(%s)\n",
           dir));
-  
+
   if (RemoveDirectoryA(dir))
     return 0;

trunk/src/crtdll/exit.c

@@ +1 @@
+/* $Id: exit.c,v 1.2 2001-09-05 12:14:24 bird Exp $ */
 /*
  * CRTDLL exit/abort/atexit functions
- * 
+ *
  * Copyright 1996,1998 Marcus Meissner
  * Copyright 1996 Jukka Iivonen
@@ -10 +11 @@
  * and whether they return to the caller (really!).
  *            return      do
- *  Name      to caller?  cleanup? 
+ *  Name      to caller?  cleanup?
  *  _c_exit     Y           N
  *  _cexit      Y           Y
@@ -54 +55 @@
 
 /*********************************************************************
- *      __dllonexit                             (CRTDLL.25)
+ *  __dllonexit                     (CRTDLL.25)
  */
 VOID CDECL CRTDLL___dllonexit ()
-{       
+{
   dprintf(("__dllonexit not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -64 +65 @@
 
 /*********************************************************************
- *      _abnormal_termination                   (CRTDLL.36)
+ *  _abnormal_termination           (CRTDLL.36)
  */
 int CDECL CRTDLL__abnormal_termination(void)
@@ -83 +84 @@
 {
   dprintf2(("CRTDLL: _amsg_exit\n"));
-  
+
   // fprintf(stderr,strerror(errnum));
   // ExitProcess(-1);
-  
+
   CRTDLL_fprintf(CRTDLL_stderr,"\nrun-time error:\nError Code %d\n",errnum);
   CRTDLL__exit(255);
@@ -95 +96 @@
  *                  _assert     (CRTDLL.041)
  *
- * Print an assertion message and call abort(). Really only present 
+ * Print an assertion message and call abort(). Really only present
  * for win binaries. Winelib programs would typically use libc's
  * version.
@@ -102 +103 @@
 {
   dprintf2(("CRTDLL: _assert\n"));
-  
+
   CRTDLL_fprintf(CRTDLL_stderr,"Assertion failed: %s, file %s, line %d\n\n",
                  (char*)str,(char*)file, line);
   CRTDLL_abort();
-  
+
   // _assert(str, file, line);
 }
@@ -119 +120 @@
   dprintf2(("_c_exit(%d)\n",ret));
   FIXME("not calling CRTDLL cleanup\n");
-  
+
   /* dont exit, return to caller */
-  
+
   ExitProcess(ret);
 }
@@ -135 +136 @@
   FIXME("not calling CRTDLL cleanup\n");
   /* dont exit, return to caller */
-  
+
   ExitProcess(ret);
 }
@@ -145 +146 @@
 VOID CDECL CRTDLL__exit(LONG ret)
 {
-  dprintf2(("CRTDLL: _exit (%08xh)\n", 
+  dprintf2(("CRTDLL: _exit (%08xh)\n",
             ret));
   TRACE(":exit code %ld\n",ret);
@@ -199 +200 @@
 {
   dprintf2(("CRTDLL: abort\n"));
-  
+
   CRTDLL_fprintf(CRTDLL_stderr,"\nabnormal program termination\n");
   CRTDLL__exit(3);
@@ -207 +208 @@
 
 /*********************************************************************
- *                  atexit      (CRTDLL.342)
+ *                  atexit  (CRTDLL.342)
  *
  * Register a function to be called when the process terminates.
@@ -214 +215 @@
 {
   dprintf(("CRTDLL: atexit\n"));
-  
+
   return CRTDLL__onexit(func) == func ? 0 : -1;
-  
+
   // if (_atexit_n >= sizeof (_atexit_v) / sizeof (_atexit_v[0]))
   //   return -1;

trunk/src/crtdll/file.c

@@ +1 @@
+/* $Id: file.c,v 1.3 2001-09-05 12:14:24 bird Exp $ */
 /*
  * CRTDLL file functions
- * 
+ *
  * Copyright 1996,1998 Marcus Meissner
  * Copyright 1996 Jukka Iivonen
@@ -8 +9 @@
  *
  * Implementation Notes:
- * Mapping is performed between FILE*, fd and HANDLE's. This allows us to 
- * implement all calls using the Win32 API, support remapping fd's to 
+ * Mapping is performed between FILE*, fd and HANDLE's. This allows us to
+ * implement all calls using the Win32 API, support remapping fd's to
  * FILES and do some other tricks as well (like closeall, _get_osfhandle).
  * For mix and matching with the host libc, processes can use the Win32 HANDLE
@@ -128 +129 @@
   else
     while(__CRTDLL_fdstart < __CRTDLL_fdend &&
-          __CRTDLL_handles[__CRTDLL_fdstart] != INVALID_HANDLE_VALUE)
+      __CRTDLL_handles[__CRTDLL_fdstart] != INVALID_HANDLE_VALUE)
       __CRTDLL_fdstart++;
 
@@ -143 +144 @@
 {
   TRACE(":fd (%d) allocating FILE*\n",fd);
-  if (fd < 0 || fd >= __CRTDLL_fdend || 
+  if (fd < 0 || fd >= __CRTDLL_fdend ||
       __CRTDLL_handles[fd] == INVALID_HANDLE_VALUE)
   {
@@ -178 +179 @@
 
   TRACE(":handles (%d)(%d)(%d)\n",__CRTDLL_handles[0],
-        __CRTDLL_handles[1],__CRTDLL_handles[2]);
+    __CRTDLL_handles[1],__CRTDLL_handles[2]);
 
   for (i = 0; i < 3; i++)
@@ -195 +196 @@
 {
   // return (_access(path, mode));
-  
+
   DWORD attr = GetFileAttributesA(filename);
 
@@ -202 +203 @@
     if (!filename)
     {
-        /* FIXME: Should GetFileAttributesA() return this? */
+    /* FIXME: Should GetFileAttributesA() return this? */
       __CRTDLL__set_errno(ERROR_INVALID_DATA);
       return -1;
@@ -303 +304 @@
 {
   // return (__eof(_fd));
-  
+
   DWORD curpos,endpos;
   HANDLE hand = __CRTDLL__fdtoh(fd);
@@ -338 +339 @@
 {
   // return (_fcloseall());
-  
+
   int num_closed = 0, i = 3;
 
@@ -361 +362 @@
 {
   // return (_fdopen(handle, mode));
-  
+
   CRTDLL_FILE* file = __CRTDLL__alloc_fp(fd);
 
@@ -378 +379 @@
 {
   // return (_fgetchar());
-  
+
   return CRTDLL_fgetc(CRTDLL_stdin);
 }
@@ -390 +391 @@
  * becomes negative. We ensure that _cnt is always 0 after any read
  * so this function is always called. Our implementation simply calls
- * fgetc as all the underlying buffering is handled by Wines 
+ * fgetc as all the underlying buffering is handled by Wines
  * implementation of the Win32 file I/O calls.
  */
@@ -410 +411 @@
 {
   // return (_fileno(f));
-  
+
   TRACE(":FILE* (%p) fd (%d)\n",file,file->_file);
   return file->_file;
@@ -440 +441 @@
 {
   // return (_flushall());
-  
+
   int num_flushed = 0, i = 3;
 
@@ -447 +448 @@
     {
       if (CRTDLL__commit(i) == -1)
-        if (__CRTDLL_files[i])
-          __CRTDLL_files[i]->_flag |= _IOERR;
+    if (__CRTDLL_files[i])
+      __CRTDLL_files[i]->_flag |= _IOERR;
       num_flushed++;
     }
@@ -465 +466 @@
 {
   // return(_fputchar(c));
-  
+
   return CRTDLL_fputc(c, CRTDLL_stdout);
 }
@@ -484 +485 @@
 /*********************************************************************
  *                  _fstat        (CRTDLL.111)
- * 
+ *
  * Get information about an open file.
  */
@@ -490 +491 @@
 {
   // return (_fstat(file, buf));
-  
+
   DWORD dw;
   BY_HANDLE_FILE_INFORMATION hfi;
@@ -548 +549 @@
   {
     /* FIXME: I'm not convinced that I should be copying the
-     * handle here - it may be leaked if the app doesn't 
+     * handle here - it may be leaked if the app doesn't
      * close it (and the API docs dont say that it should)
      * Not duplicating it means that it can't be inherited
@@ -557 +558 @@
      */
     DuplicateHandle(GetCurrentProcess(),hand,GetCurrentProcess(),
-                    &newhand,0,TRUE,DUPLICATE_SAME_ACCESS );
+            &newhand,0,TRUE,DUPLICATE_SAME_ACCESS );
   }
   return newhand;
@@ -588 +589 @@
 {
   // return (_lseek(handle, offset, origin));
-  
+
   LONG ret;
   HANDLE hand = __CRTDLL__fdtoh(fd);
@@ -777 +778 @@
 {
   // return (_setmode(fh, mode));
-  
+
   if (mode & _O_TEXT)
     FIXME("fd (%d) mode (%d) TEXT not implemented\n",fd,mode);
@@ -790 +791 @@
 {
   // return(_stat(s1, n));
-  
+
   DWORD dw;
   WIN32_FILE_ATTRIBUTE_DATA hfi;
@@ -826 +827 @@
     {
       unsigned int ext = tolower(path[plen-1]) | (tolower(path[plen-2]) << 8)
-        | (tolower(path[plen-3]) << 16);
+    | (tolower(path[plen-3]) << 16);
       if (ext == EXE || ext == BAT || ext == CMD || ext == COM)
-        mode |= CRTDLL_S_IEXEC;
+    mode |= CRTDLL_S_IEXEC;
     }
   }
@@ -843 +844 @@
   buf->st_mtime = buf->st_ctime = dw;
   TRACE("\n%d %d %d %d %d %d\n", buf->st_mode,buf->st_nlink,buf->st_size,
-        buf->st_atime,buf->st_mtime, buf->st_ctime);
+    buf->st_atime,buf->st_mtime, buf->st_ctime);
   return 0;
 }
@@ -856 +857 @@
 {
   // return (_tell(i));
-  
+
   return CRTDLL__lseek(fd, 0, SEEK_CUR);
 }
@@ -863 +864 @@
 /*********************************************************************
  *                  _tempnam           (CRTDLL.305)
- * 
+ *
  */
 LPSTR CDECL CRTDLL__tempnam(LPCSTR dir, LPCSTR prefix)
 {
   // return (_tempnam(dir, prefix));
-  
+
   char tmpbuf[MAX_PATH];
 
@@ -890 +891 @@
 {
   // return (_umask(i));
-  
+
   INT old_umask = __CRTDLL_umask;
   TRACE("umask (%d)\n",umask);
@@ -976 +977 @@
 {
   // return (fclose(fp));
-  
+
   return CRTDLL__close(file->_file);
 }
@@ -989 +990 @@
 {
   // return (feof(fp));
-  
+
   return file->_flag & _IOEOF;
 }
@@ -1002 +1003 @@
 {
   // return (ferror(fp));
-  
+
   return file->_flag & _IOERR;
 }
@@ -1024 +1025 @@
 {
   // return (fgetc(fp));
-  
+
   char c;
   if (CRTDLL__read(file->_file,&c,1) != 1)
@@ -1050 +1051 @@
 {
   // return (fgets(s, n, fp));
-  
+
   int    cc;
   LPSTR  buf_start = s;
 
   TRACE(":file(%p) fd (%d) str (%p) len (%d)\n",
-        file,file->_file,s,size);
+    file,file->_file,s,size);
 
   /* BAD, for the whole WINE process blocks... just done this way to test
@@ -1088 +1089 @@
 {
   // return (fputs(s, fp));
-  
+
   return CRTDLL_fwrite(s,strlen(s),1,file);
 }
@@ -1099 +1100 @@
 {
     // return (fprintf(file, format, arg));
-  
+
     va_list valist;
     INT res;
@@ -1118 +1119 @@
 {
   // return (fopen( filename, mode));
-  
+
   CRTDLL_FILE* file;
   INT flags = 0, plus = 0, fd;
@@ -1182 +1183 @@
 {
   // return (fputc(c, fp));
-  
+
   return CRTDLL__write(file->_file, &c, 1) == 1? c : EOF;
 }
@@ -1193 +1194 @@
 {
   // return (fread(ptr, size, n, fp));
-  
+
   DWORD read = CRTDLL__read(file->_file,ptr, size * nmemb);
   if (read <= 0)
@@ -1203 +1204 @@
 /*********************************************************************
  *                  freopen    (CRTDLL.379)
- * 
+ *
  */
 CRTDLL_FILE* CDECL CRTDLL_freopen(LPCSTR path, LPCSTR mode,CRTDLL_FILE* file)
 {
   // return (freopen(filename, mode, fp));
-  
+
   CRTDLL_FILE* newfile;
   INT fd;
@@ -1256 +1257 @@
 {
   // return (fsetpos(fp, pos));
-  
+
   return CRTDLL__lseek(file->_file,*pos,SEEK_SET);
 }
@@ -1392 +1393 @@
 {
   // return (fseek(file, offset, whence));
-  
+
   return CRTDLL__lseek(file->_file,offset,whence);
 }
@@ -1403 +1404 @@
 {
   // return (ftell(fp));
-  
+
   return CRTDLL__tell(file->_file);
 }
@@ -1428 +1429 @@
 {
   // return (getchar());
-  
+
   return CRTDLL_fgetc(CRTDLL_stdin);
 }
@@ -1459 +1460 @@
      */
     for(cc = CRTDLL_fgetc(CRTDLL_stdin); cc != EOF && cc != '\n';
-        cc = CRTDLL_fgetc(CRTDLL_stdin))
-        if(cc != '\r') *buf++ = (char)cc;
+    cc = CRTDLL_fgetc(CRTDLL_stdin))
+    if(cc != '\r') *buf++ = (char)cc;
 
     *buf = '\0';
@@ -1497 +1498 @@
 {
   // return puts( s );
-  
+
   return CRTDLL_fputs(s, CRTDLL_stdout);
 }
@@ -1511 +1512 @@
 {
   // rewind(fp);
-  
+
   TRACE(":file (%p) fd (%d)\n",file,file->_file);
   CRTDLL__lseek(file->_file,0,SEEK_SET);
@@ -1524 +1525 @@
 {
   // return (remove(file));
-  
+
   TRACE(":path (%s)\n",path);
   if (DeleteFileA(path))
@@ -1540 +1541 @@
 {
   // return (rename(old, new2));
-  
+
   TRACE(":from %s to %s\n",oldpath,newpath);
   if (MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
@@ -1556 +1557 @@
 {
   // setbuf(fp, buf);
-  
+
   TRACE(":file (%p) fd (%d) buf (%p)\n", file, file->_file,buf);
   if (buf)
@@ -1569 +1570 @@
  *
  * lcclnk from lcc-win32 relies on a terminating dot in the name returned
- * 
+ *
  */
 LPSTR CDECL CRTDLL_tmpnam(LPSTR s)
 {
   // return (tmpnam(s));
-  
+
   char tmpbuf[MAX_PATH];
   char* prefix = "TMP";
@@ -1599 +1600 @@
 {
   // return (vfprintf(file, format, args));
-  
+
   /* FIXME: We should parse the format string, calculate the maximum,
    * length of each arg, malloc a buffer, print to it, and fwrite that.

trunk/src/crtdll/initterm.cpp

@@ +1 @@
+/* $Id: initterm.cpp,v 1.7 2001-09-05 12:14:25 bird Exp $ */
 /*
  * DLL entry point
@@ -55 +56 @@
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-        return CRTDLL_Init(hinstDLL, fdwReason, fImpLoad);
+    return CRTDLL_Init(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_PROCESS_DETACH:
-        CRTDLL_Init(hinstDLL, fdwReason, fImpLoad);
-        ctordtorTerm();
-        return TRUE;
+    CRTDLL_Init(hinstDLL, fdwReason, fImpLoad);
+    ctordtorTerm();
+    return TRUE;
    }
    return FALSE;
@@ -90 +91 @@
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0) 
-                return 0UL;
+     dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
+         if(dllHandle == 0)
+        return 0UL;
 
          break;
       case 1 :
          if(dllHandle) {
-                UnregisterLxDll(dllHandle);
+        UnregisterLxDll(dllHandle);
          }
          break;

trunk/src/crtdll/memory.c

@@ +1 @@
+/* $Id: memory.c,v 1.3 2001-09-05 12:14:25 bird Exp $ */
 /*
  * CRTDLL memory functions
- * 
+ *
  * Copyright 1996,1998 Marcus Meissner
  * Copyright 1996 Jukka Iivonen
@@ -32 +33 @@
     VOID* result;
     if(!(result = HeapAlloc(GetProcessHeap(),0,size)) && new_handler)
-        (*new_handler)();
+    (*new_handler)();
     return result;
 }
@@ -79 +80 @@
 {
   // return (_heapchk());
-  
+
   if (!HeapValidate( GetProcessHeap(), 0, NULL))
   {
@@ -97 +98 @@
 {
   // return (_heapmin());
-  
+
   if (!HeapCompact( GetProcessHeap(), 0 ))
   {
@@ -116 +117 @@
 {
   // return (_heapset(fill));
-  
+
   INT retVal;
   struct _heapinfo heap;
@@ -144 +145 @@
   phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0;
 
-  if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && 
+  if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY &&
       !HeapValidate( GetProcessHeap(), 0, phe.lpData ))
   {
@@ -180 +181 @@
 {
   // return (_msize(ptr));
-  
+
   LONG size = HeapSize(GetProcessHeap(),0,mem);
   if (size == -1)
@@ -215 +216 @@
 /*********************************************************************
  *                  malloc        (CRTDLL.424)
- * 
+ *
  * Alocate memory from the heap.
  */

trunk/src/crtdll/spawn.c

@@ +1 @@
+/* $Id: spawn.c,v 1.3 2001-09-05 12:14:25 bird Exp $ */
 /*
  * CRTDLL spawn functions
- * 
+ *
  * Copyright 1996,1998 Marcus Meissner
  * Copyright 1996 Jukka Iivonen
@@ -24 +25 @@
  * Implementation Notes:
  * MT Safe - But only because of missing functionality.
- * 
+ *
  * After translating input arguments into the required format for
  * CreateProcess(), the internal function __CRTDLL__spawn() is
@@ -82 +83 @@
 
   if (!CreateProcessA(exe, args, NULL, NULL, TRUE,
-                      flags == _P_DETACH ? DETACHED_PROCESS : 0,
-                      env, NULL, &si, &pi))
+              flags == _P_DETACH ? DETACHED_PROCESS : 0,
+              env, NULL, &si, &pi))
   {
     __CRTDLL__set_errno(GetLastError());
@@ -157 +158 @@
 {
   // return (_spawnve(i, s1, s2, s3));
-  
+
   LPSTR args = __CRTDLL__argvtos(argv,' ');
   LPSTR envs = __CRTDLL__argvtos(envv,0);
@@ -186 +187 @@
 {
   // return system(string);
-  
+
     /* FIXME: should probably launch cmd interpreter in COMSPEC */
     return __CRTDLL__spawn(_P_WAIT, NULL, x, NULL);