Changeset 6645 for trunk/src/comdlg32/filedlg.c

Timestamp:

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

Author:

bird

Message:

Added $Id:$ keyword.

File:

• trunk/src/comdlg32/filedlg.c (modified) (64 diffs)

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
     {