Changeset 3243 for trunk/src/comdlg32/filedlg95.c

Timestamp:

Mar 26, 2000, 6:34:57 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000324

File:

• trunk/src/comdlg32/filedlg95.c (modified) (68 diffs)

trunk/src/comdlg32/filedlg95.c

@@ +1 @@
+/* $Id: filedlg95.c,v 1.4 2000-03-26 16:31:41 cbratschi Exp $*/
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
+ * Copyright 2000 Christoph Bratschi (cbratschi@datacomm.ch)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * Corel WINE 20000324 level
  */
 #ifdef __WIN32OS2__
@@ -48 +53 @@
   CHAR*        szDisplayName;
   INT          iIcon;
+  INT          iSelIcon;
   HIMAGELIST   ilItemImage;
 
@@ -173 +179 @@
 HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
 HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPSTR lpstrFileList, UINT nFileCount, UINT sizeUsed);
+static BOOL BrowseSelectedFolder(HWND hwnd);
 
 /***********************************************************************
@@ -207 +215 @@
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
-                                  fodInfos->ofnInfos.hwndOwner,
+                                  fodInfos->ofnInfos->hwndOwner,
                                   (DLGPROC) FileOpenDlgProc95,
                                   (LPARAM) fodInfos);
@@ -229 +237 @@
 BOOL  WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
 {
-
   BOOL ret;
   FileOpenDlgInfos *fodInfos;
+  HINSTANCE hInstance;
+  LPCSTR lpstrFilter = NULL;
+  LPSTR lpstrCustomFilter = NULL;
+  LPCSTR lpstrInitialDir = NULL;
+  DWORD dwFlags = 0;
 
   /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
-  memset(&fodInfos->ofnInfos,'\0',sizeof(*ofn)); fodInfos->ofnInfos.lStructSize = sizeof(*ofn);
-  fodInfos->ofnInfos.hwndOwner = ofn->hwndOwner;
-  fodInfos->ofnInfos.hInstance = MapHModuleLS(ofn->hInstance);
+
+  /* Pass in the original ofn */
+  fodInfos->ofnInfos = ofn;
+
+  /* Save original hInstance value */
+  hInstance = ofn->hInstance;
+  fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
+
   if (ofn->lpstrFilter)
   {
     LPSTR s,x;
+    lpstrFilter = ofn->lpstrFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -249 +267 @@
     x = (LPSTR)MemAlloc(s-ofn->lpstrFilter);
     memcpy(x,ofn->lpstrFilter,s-ofn->lpstrFilter);
-    fodInfos->ofnInfos.lpstrFilter = (LPSTR)x;
+    fodInfos->ofnInfos->lpstrFilter = (LPSTR)x;
   }
   if (ofn->lpstrCustomFilter)
   {
     LPSTR s,x;
+    lpstrCustomFilter = ofn->lpstrCustomFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -262 +281 @@
     x = MemAlloc(s-ofn->lpstrCustomFilter);
     memcpy(x,ofn->lpstrCustomFilter,s-ofn->lpstrCustomFilter);
-    fodInfos->ofnInfos.lpstrCustomFilter = (LPSTR)x;
-  }
-  fodInfos->ofnInfos.nMaxCustFilter = ofn->nMaxCustFilter;
-  fodInfos->ofnInfos.nFilterIndex = ofn->nFilterIndex;
-  if (ofn->nMaxFile)
-  {
-      fodInfos->ofnInfos.lpstrFile = (LPSTR)MemAlloc(ofn->nMaxFile);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrFile,ofn->lpstrFile);
-  }
-  fodInfos->ofnInfos.nMaxFile = ofn->nMaxFile;
-  fodInfos->ofnInfos.nMaxFileTitle = ofn->nMaxFileTitle;
-    if (fodInfos->ofnInfos.nMaxFileTitle)
-      fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle);
-  if (ofn->lpstrInitialDir)
-  {
-      fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(strlen(ofn->lpstrInitialDir)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir);
-  }
-
-  if (ofn->lpstrTitle)
-  {
-      fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(strlen(ofn->lpstrTitle)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle);
-  }
-
-  fodInfos->ofnInfos.Flags = ofn->Flags|OFN_WINE;
-  fodInfos->ofnInfos.nFileOffset = ofn->nFileOffset;
-  fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension;
-  if (ofn->lpstrDefExt)
-  {
-      fodInfos->ofnInfos.lpstrDefExt = MemAlloc(strlen(ofn->lpstrDefExt)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
-  }
-  fodInfos->ofnInfos.lCustData = ofn->lCustData;
-  fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
-
-  if (HIWORD(ofn->lpTemplateName))
-  {
-      fodInfos->ofnInfos.lpTemplateName = MemAlloc(strlen(ofn->lpTemplateName)+1);
-      strcpy ((LPSTR)fodInfos->ofnInfos.lpTemplateName, ofn->lpTemplateName);
-  }
-  else
-  {
-      /* resource id */
-      fodInfos->ofnInfos.lpTemplateName = ofn->lpTemplateName;
-  }
+    fodInfos->ofnInfos->lpstrCustomFilter = (LPSTR)x;
+  }
+
+  dwFlags = ofn->Flags;
+  fodInfos->ofnInfos->Flags = ofn->Flags|OFN_WINE;
 
   /* Replace the NULL lpstrInitialDir by the current folder */
-  if(!ofn->lpstrInitialDir)
-  {
-    fodInfos->ofnInfos.lpstrInitialDir = MemAlloc(MAX_PATH);
-    GetCurrentDirectoryA(MAX_PATH,(LPSTR)fodInfos->ofnInfos.lpstrInitialDir);
+  lpstrInitialDir = ofn->lpstrInitialDir;
+  if(!lpstrInitialDir)
+  {
+    fodInfos->ofnInfos->lpstrInitialDir = MemAlloc(MAX_PATH);
+    GetCurrentDirectoryA(MAX_PATH,(LPSTR)fodInfos->ofnInfos->lpstrInitialDir);
   }
 
@@ -333 +312 @@
   }
 
-  ofn->nFileOffset = fodInfos->ofnInfos.nFileOffset;
-  ofn->nFileExtension = fodInfos->ofnInfos.nFileExtension;
-
-  /*
-     Transfer the combo index in the OPENFILENAME structure;
-     No support for custom filters, so nFilterIndex must be one-based.
-  */
-  ofn->nFilterIndex = fodInfos->ofnInfos.nFilterIndex;
-
-  if (fodInfos->ofnInfos.lpstrFilter)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
-  if (fodInfos->ofnInfos.lpstrDefExt)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrDefExt));
-  if (fodInfos->ofnInfos.lpstrTitle)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrTitle));
-  if (fodInfos->ofnInfos.lpstrInitialDir)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrInitialDir));
-  if (fodInfos->ofnInfos.lpstrCustomFilter)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrCustomFilter));
-
-  if (fodInfos->ofnInfos.lpstrFile)
-  {
-      /*
-       * We have to clear the buffer before we copy the filename since we don't
-       * support selecting multiple files. We have to make sure that the caller won't
-       * attempt to read past the first filename.
-       */
-      memset(ofn->lpstrFile, '\0', ofn->nMaxFile);
-      strcpy(ofn->lpstrFile,fodInfos->ofnInfos.lpstrFile);
-      MemFree((LPVOID)fodInfos->ofnInfos.lpstrFile);
-  }
-  if (fodInfos->ofnInfos.lpstrFileTitle)
-    {
-      if (ofn->lpstrFileTitle)
-          strcpy(ofn->lpstrFileTitle,
-                 fodInfos->ofnInfos.lpstrFileTitle);
-      MemFree((LPVOID)fodInfos->ofnInfos.lpstrFileTitle);
+  if (lpstrInitialDir)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrInitialDir));
+    fodInfos->ofnInfos->lpstrInitialDir = lpstrInitialDir;
       }
-
+  if (lpstrFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrFilter));
+    fodInfos->ofnInfos->lpstrFilter = lpstrFilter;
+  }
+  if (lpstrCustomFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrCustomFilter));
+    fodInfos->ofnInfos->lpstrCustomFilter = lpstrCustomFilter;
+  }
+
+  ofn->Flags = dwFlags;
+  ofn->hInstance = hInstance;
   MemFree((LPVOID)(fodInfos));
   return ret;
@@ -391 +347 @@
   BOOL ret;
   FileOpenDlgInfos *fodInfos;
+  HINSTANCE hInstance;
+  LPCSTR lpstrFilter = NULL;
+  LPSTR lpstrCustomFilter = NULL;
+  DWORD dwFlags;
 
   /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
-  memset(&fodInfos->ofnInfos,'\0',sizeof(*ofn));
-  fodInfos->ofnInfos.lStructSize = sizeof(*ofn);
-  fodInfos->ofnInfos.hwndOwner = ofn->hwndOwner;
-  fodInfos->ofnInfos.hInstance = MapHModuleLS(ofn->hInstance);
+
+  /*  Pass in the original ofn */
+  fodInfos->ofnInfos = (LPOPENFILENAMEA)ofn;
+
+  /* Save hInstance */
+  hInstance = fodInfos->ofnInfos->hInstance;
+  fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
+
+  /* Save lpstrFilter */
   if (ofn->lpstrFilter)
   {
@@ -403 +368 @@
     LPSTR x,y;
     int n;
+
+    lpstrFilter = fodInfos->ofnInfos->lpstrFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -419 +386 @@
     }
     *x=0;
-    fodInfos->ofnInfos.lpstrFilter = (LPSTR)y;
-  }
-  if (ofn->lpstrCustomFilter) {
+    fodInfos->ofnInfos->lpstrFilter = (LPSTR)y;
+  }
+  /* Save lpstrCustomFilter */
+  if (ofn->lpstrCustomFilter)
+  {
     LPWSTR  s;
     LPSTR x,y;
     int n;
 
+    lpstrCustomFilter = fodInfos->ofnInfos->lpstrCustomFilter;
     /* filter is a list...  title\0ext\0......\0\0 */
     s = (LPWSTR)ofn->lpstrCustomFilter;
@@ -440 +410 @@
     }
     *x=0;
-    fodInfos->ofnInfos.lpstrCustomFilter = (LPSTR)y;
-  }
-  fodInfos->ofnInfos.nMaxCustFilter = ofn->nMaxCustFilter;
-  fodInfos->ofnInfos.nFilterIndex = ofn->nFilterIndex;
-  if (ofn->nMaxFile)
-     fodInfos->ofnInfos.lpstrFile = (LPSTR)MemAlloc(ofn->nMaxFile);
-  fodInfos->ofnInfos.nMaxFile = ofn->nMaxFile;
-  fodInfos->ofnInfos.nMaxFileTitle = ofn->nMaxFileTitle;
-  if (ofn->nMaxFileTitle)
-    fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle);
-  if (ofn->lpstrInitialDir)
-  {
-    fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrInitialDir)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir);
-  }
-  if (ofn->lpstrTitle)
-  {
-    fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrTitle)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle);
-  }
-  fodInfos->ofnInfos.Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
-  fodInfos->ofnInfos.nFileOffset = ofn->nFileOffset;
-  fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension;
-  if (ofn->lpstrDefExt)
-  {
-    fodInfos->ofnInfos.lpstrDefExt = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrDefExt)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
-  }
-  fodInfos->ofnInfos.lCustData = ofn->lCustData;
-  fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
-
-  if (HIWORD(ofn->lpTemplateName))
-  {
-    fodInfos->ofnInfos.lpTemplateName = (LPSTR)MemAlloc(lstrlenW(ofn->lpTemplateName)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpTemplateName,ofn->lpTemplateName);
-  }
-  else
-  {
-      /* resource id */
-      fodInfos->ofnInfos.lpTemplateName = (LPSTR)ofn->lpTemplateName;
-  }
+    fodInfos->ofnInfos->lpstrCustomFilter = (LPSTR)y;
+  }
+
+  /* Save Flags */
+  dwFlags = fodInfos->ofnInfos->Flags;
+  fodInfos->ofnInfos->Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
+
   /* Initialise the dialog property */
   fodInfos->DlgInfos.dwDlgProp = 0;
@@ -498 +434 @@
 
   /* Cleaning */
-  ofn->nFileOffset = fodInfos->ofnInfos.nFileOffset;
-  ofn->nFileExtension = fodInfos->ofnInfos.nFileExtension;
-
-  /*
-     Transfer the combo index in the OPENFILENAME structure;
-     No support for custom filters, so nFilterIndex must be one-based.
-  */
-  ofn->nFilterIndex = fodInfos->ofnInfos.nFilterIndex;
-
-  if (fodInfos->ofnInfos.lpstrFilter)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
-  if (fodInfos->ofnInfos.lpstrDefExt)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrDefExt));
-  if (fodInfos->ofnInfos.lpstrTitle)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrTitle));
-  if (fodInfos->ofnInfos.lpstrInitialDir)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrInitialDir));
-  if (fodInfos->ofnInfos.lpstrCustomFilter)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrCustomFilter));
-
-  if (fodInfos->ofnInfos.lpstrFile)
-  {
-      /*
-       * We have to clear the buffer before we copy the filename since we don't
-       * support selecting multiple files. We have to make sure that the caller won't
-       * attempt to read past the first filename.
-       */
-      memset(ofn->lpstrFile, '\0', ofn->nMaxFile * sizeof(WCHAR) );
-      lstrcpyAtoW(ofn->lpstrFile,(fodInfos->ofnInfos.lpstrFile));
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFile));
-  }
-
-  if (fodInfos->ofnInfos.lpstrFileTitle) {
-      if (ofn->lpstrFileTitle)
-                lstrcpyAtoW(ofn->lpstrFileTitle,
-      (fodInfos->ofnInfos.lpstrFileTitle));
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFileTitle));
-  }
+  /* Restore Flags */
+  fodInfos->ofnInfos->Flags = dwFlags;
+
+  /* Restore lpstrFilter */
+  if (fodInfos->ofnInfos->lpstrFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrFilter));
+    fodInfos->ofnInfos->lpstrFilter = lpstrFilter;
+  }
+  if (fodInfos->ofnInfos->lpstrCustomFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrCustomFilter));
+    fodInfos->ofnInfos->lpstrCustomFilter = lpstrCustomFilter;
+  }
+
+  /* Restore hInstance */
+  fodInfos->ofnInfos->hInstance = hInstance;
   MemFree((LPVOID)(fodInfos));
   return ret;
-
 }
 
@@ -688 +600 @@
                 lParam = (LPARAM) &fodInfos->ofnInfos;
                 ArrangeCtrlPositions(hwnd,GetParent(hwnd));
-            if(fodInfos && (fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos.lpfnHook)
-                 return CallWindowProcA((WNDPROC)fodInfos->ofnInfos.lpfnHook,hwnd,uMsg,wParam,lParam);
+            if(fodInfos && (fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
+                 return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
                 return 0;
         }
     }
-    if(fodInfos && (fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos.lpfnHook )
-        return CallWindowProcA((WNDPROC)fodInfos->ofnInfos.lpfnHook,hwnd,uMsg,wParam,lParam);
+    if(fodInfos && (fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook )
+        return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
   return DefWindowProcA(hwnd,uMsg,wParam,lParam);
 }
@@ -704 +616 @@
     HANDLE hDlgTmpl = 0;
     HWND hChildDlg = 0;
-   if (fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATEHANDLE)
+   if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
    {
-        if (fodInfos->ofnInfos.Flags  & OFN_ENABLETEMPLATEHANDLE)
+        if (fodInfos->ofnInfos->Flags  & OFN_ENABLETEMPLATEHANDLE)
         {
-           if( !(template = LockResource( fodInfos->ofnInfos.hInstance)))
+           if( !(template = LockResource( fodInfos->ofnInfos->hInstance)))
                 {
                 COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
@@ -717 +629 @@
         else
         {
-         if (!(hRes = FindResourceA(MapHModuleSL(fodInfos->ofnInfos.hInstance),
-            (fodInfos->ofnInfos.lpTemplateName), RT_DIALOGA)))
+         if (!(hRes = FindResourceA(MapHModuleSL(fodInfos->ofnInfos->hInstance),
+            (fodInfos->ofnInfos->lpTemplateName), RT_DIALOGA)))
         {
                 COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
                  return (HWND)NULL;
         }
-        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos.hInstance),
+        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos->hInstance),
              hRes )) ||
                  !(template = LockResource( hDlgTmpl )))
@@ -732 +644 @@
         }
 
-        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,template,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,template,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
         if(hChildDlg)
         {
@@ -739 +651 @@
         }
  }
- else if(fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK && fodInfos->ofnInfos.lpfnHook)
+ else if(fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK && fodInfos->ofnInfos->lpfnHook)
  {
         RECT rectHwnd;
@@ -752 +664 @@
         tmplate.cy = rectHwnd.bottom-rectHwnd.top;
 
-        return CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+        return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
  }
 return (HWND)NULL;
@@ -774 +686 @@
         ofnNotify.hdr.idFrom=0;
         ofnNotify.hdr.code = uCode;
-        ofnNotify.lpOFN = &fodInfos->ofnInfos;
+        ofnNotify.lpOFN = fodInfos->ofnInfos;
         return SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
     }
@@ -788 +700 @@
 {
     LPSTR lpstrFileSpec;
-    int reqSize;
-    char lpstrPath[MAX_PATH];
+    char lpstrCurrentDir[MAX_PATH]="";
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
     if(!fodInfos)
-        return -1;
+        return TRUE;
     switch(uMsg)
     {
         case CDM_GETFILEPATH:
+        {
+            char lpstrPathSpec[MAX_PATH]="";
+            GetDlgItemTextA(hwnd,IDC_FILENAME,(LPSTR)lParam, (int)wParam);
+            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA((LPSTR)lParam);
+            strcpy(lpstrPathSpec,(LPSTR)lParam);
+            COMDLG32_PathRemoveFileSpecA(lpstrPathSpec);
+            if(!lpstrPathSpec[0])
+                COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
+                lpstrPathSpec);
+            strcat(lpstrPathSpec,"\\");
+            strcat(lpstrPathSpec,(LPSTR)lParam);
+            strcpy((LPSTR)lParam,(LPSTR)lpstrPathSpec);
+        }
+            return TRUE;
+        case CDM_GETFOLDERPATH:
+            if(lParam)
             {
-            GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath) {
-                char lpstrCurrentDir[MAX_PATH];
-                /* Prepend the current path */
-                COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir);
-                if ((LPSTR)lParam!=NULL)
-                    wsnprintfA((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
-                reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
-            } else {
-                lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
-                reqSize=strlen(lpstrPath);
+                if(fodInfos)
+                {
+                    COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
+                    lpstrCurrentDir);
+                    strncpy((LPSTR)lParam,lpstrCurrentDir,(int)wParam);
                 }
+                else
+                *((LPSTR)lParam)=0;
             }
-            /* return the required buffer size */
-            return reqSize;
-        case CDM_GETFOLDERPATH:
-            COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
-            if ((LPSTR)lParam!=NULL)
-                lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
-            return strlen(lpstrPath);
+            return TRUE;
     case CDM_GETSPEC:
-            reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrPath);
-            if ((LPSTR)lParam!=NULL)
-                lstrcpynA((LPSTR)lParam, lpstrFileSpec, (int)wParam);
-            return strlen(lpstrFileSpec);
+            if(lParam)
+            {
+                GetDlgItemTextA(hwnd,IDC_FILENAME,(LPSTR)lParam, (int)wParam);
+                lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA((LPSTR)lParam);
+                if(lpstrFileSpec)
+                   strcpy((LPSTR)lParam, lpstrFileSpec);
+                else
+                    *((LPSTR)lParam)=0;
+            }
+            return TRUE;
+        case CDM_SETCONTROLTEXT:
+          if ( 0 != lParam )
+            SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
+          return TRUE;
         case CDM_HIDECONTROL:
-        case CDM_SETCONTROLTEXT:
         case CDM_SETDEFEXT:
         FIXME("CDM_HIDECONTROL,CDM_SETCONTROLTEXT,CDM_SETDEFEXT not implemented\n");
         return TRUE;
     }
-    return -1;
+    return TRUE;
 }
 
@@ -869 +793 @@
 
   case WM_DESTROY:
-      RemovePropA(hwnd, FileOpenDlgInfosStr);
+        FILEDLG95_Clean(hwnd);
+        RemovePropA(hwnd, FileOpenDlgInfosStr);
+        return FALSE;
+
+    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;
+            }
+            lpdi->hinst = COMMDLG_hInstance32;
+            lpdi->lpszText =  (LPSTR) stringId;
+        }
+        return FALSE;
+    }
 
     default :
@@ -887 +847 @@
   LPITEMIDLIST pidlItemId;
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
+  DWORD count;
 
   TRACE("\n");
@@ -894 +855 @@
   InitCommonControls();
 #endif
-
+//MessageBox(hwnd,"WM_INITDIALOG",NULL,MB_OK);
+dprintf(("CB: FILEDLG95_SHELL_Init"));
+count = GetTickCount();
   /* Initialise shell objects */
   FILEDLG95_SHELL_Init(hwnd);
-
+dprintf(("CB: FILEDLG95_InitUI %d ms",GetTickCount()-count));
+count = GetTickCount();
   /* Initialise dialog UI */
   FILEDLG95_InitUI(hwnd);
-
+dprintf(("CB: FILEDLG95_LOOKIN_Init %d",GetTickCount()-count));
+count = GetTickCount();
   /* Initialize the Look In combo box*/
   FILEDLG95_LOOKIN_Init(fodInfos->DlgInfos.hwndLookInCB);
-
+dprintf(("CB: FILEDLG95_FILETYPE_Init %d",GetTickCount()-count));
+count = GetTickCount();
   /* Initialize the filter combo box */
   FILEDLG95_FILETYPE_Init(hwnd);
-
+dprintf(("CB: FILEDLG95_FILETYPE_Init done %d",GetTickCount()-count));
+count = GetTickCount();
   /* Get the initial directory pidl */
 
-  if(!(pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder,fodInfos->ofnInfos.lpstrInitialDir)))
+  if(!(pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder,fodInfos->ofnInfos->lpstrInitialDir)))
   {
     char path[MAX_PATH];
@@ -918 +885 @@
 
   }
-
+dprintf(("CB: IShellBrowser_BrowseObject %d",GetTickCount()-count));
+count = GetTickCount();
   /* Browse to the initial directory */
   IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,pidlItemId,SBSP_RELATIVE);
-
+dprintf(("CB: done WM_INITDIALOG %d",GetTickCount()-count));
   /* Free pidlItem memory */
   COMDLG32_SHFree(pidlItemId);
@@ -958 +926 @@
     /* Cancel button */
   case IDCANCEL:
-      FILEDLG95_Clean(hwnd);
       EndDialog(hwnd, FALSE);
     break;
@@ -1064 +1031 @@
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
-  if(fodInfos->ofnInfos.lpstrTitle)
-  {
-      SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle);
+  if(fodInfos->ofnInfos->lpstrTitle)
+  {
+      SetWindowTextA(hwnd,fodInfos->ofnInfos->lpstrTitle);
   }
   else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
@@ -1074 +1041 @@
 
   /* Initialise the file name edit control */
-  if(fodInfos->ofnInfos.lpstrFile)
-  {
-      SetDlgItemTextA(hwnd,IDC_FILENAME,fodInfos->ofnInfos.lpstrFile);
-  }
+  if(fodInfos->ofnInfos->lpstrFile)
+  {
+      /**
+       * When passed a fully qualified filename, windows removes
+       * the path component, before showing it in the control
+       */
+      LPSTR lpstrFileName = NULL;
+
+      lpstrFileName = (LPSTR)COMDLG32_PathFindFilenameA(fodInfos->ofnInfos->lpstrFile);
+      if(NULL != lpstrFileName)
+          SetDlgItemTextA(hwnd,IDC_FILENAME,lpstrFileName);
+      else
+          SetDlgItemTextA(hwnd,IDC_FILENAME,"");
+  }
+
   /* Must the open as read only check box be checked ?*/
-  if(fodInfos->ofnInfos.Flags & OFN_READONLY)
+  if(fodInfos->ofnInfos->Flags & OFN_READONLY)
   {
     SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
   }
   /* Must the open as read only check box be hid ?*/
-  if(fodInfos->ofnInfos.Flags & OFN_HIDEREADONLY)
+  if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY)
   {
     ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE);
+  }
+  /* Must the help button be hid ?*/
+  if (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP))
+  {
+    ShowWindow(GetDlgItem(hwnd, pshHelp), SW_HIDE);
+  }
+  /* Resize the height, if open as read only checkbox ad help button
+     are hidden */
+  if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
+       (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)) )
+  {
+    RECT rectDlg, rectHelp, rectCancel;
+    GetWindowRect(hwnd, &rectDlg);
+    GetWindowRect(GetDlgItem(hwnd, pshHelp), &rectHelp);
+    GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rectCancel);
+    /* subtract the height of the help button plus the space between
+       the help button and the cancel button to the height of the dialog */
+    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
+                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
+                 SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
   }
   /* change Open to Save */
@@ -1092 +1090 @@
   {
       SetDlgItemTextA(hwnd,IDOK,"Save");
+      SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in");
   }
   return 0;
@@ -1097 +1096 @@
 
 /***********************************************************************
+ *      FILEDLG95_OnOpenMultipleFiles
+ *
+ * Handles the opening of multiple files.
+ *
+*/
+BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPSTR lpstrFileList, UINT nFileCount, UINT sizeUsed)
+{
+  CHAR   lpstrPathSpec[MAX_PATH] = "";
+  CHAR   lpstrTempFileList[MAX_PATH] = "";
+  LPSTR  lpstrFile;
+  UINT   sizePath;
+  UINT   nCount;
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+
+  TRACE("\n");
+
+  lpstrFile = fodInfos->ofnInfos->lpstrFile;
+
+  COMDLG32_SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
+  sizePath = lstrlenA( lpstrPathSpec );
+
+  memset( lpstrFile, 0x0, fodInfos->ofnInfos->nMaxFile * sizeof(CHAR) );
+
+  if ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST ||
+          !(fodInfos->ofnInfos->Flags & OFN_EXPLORER ))
+          {
+      LPSTR lpstrTemp = lpstrFileList;
+
+      for ( nCount = 0; nCount < nFileCount; nCount++ )
+      {
+          WIN32_FIND_DATAA findData;
+          CHAR lpstrFindFile[MAX_PATH];
+
+          memset( lpstrFindFile, 0x0, MAX_PATH * sizeof(CHAR) );
+
+          lstrcpyA( lpstrFindFile, lpstrPathSpec );
+          lstrcatA( lpstrFindFile, "\\" );
+          lstrcatA( lpstrFindFile, lpstrTemp );
+
+          if ( FindFirstFileA( lpstrFindFile, &findData ) == INVALID_HANDLE_VALUE )
+          {
+              CHAR lpstrNotFound[100];
+              CHAR lpstrMsg[100];
+              CHAR tmp[400];
+
+              LoadStringA(COMMDLG_hInstance32, IDS_FILENOTFOUND, lpstrNotFound, 100);
+              LoadStringA(COMMDLG_hInstance32, IDS_VERIFYFILE, lpstrMsg, 100);
+
+              strcpy(tmp, lpstrFindFile);
+              strcat(tmp, "\n");
+              strcat(tmp, lpstrNotFound);
+              strcat(tmp, "\n");
+              strcat(tmp, lpstrMsg);
+
+              MessageBoxA(hwnd,
+                      tmp,
+                      fodInfos->ofnInfos->lpstrTitle,
+                      MB_OK | MB_ICONEXCLAMATION);
+              return FALSE;
+  }
+
+          if (!(fodInfos->ofnInfos->Flags & OFN_EXPLORER ))
+  {
+              lstrcatA( lpstrTempFileList, findData.cAlternateFileName);
+              if ( nCount + 1 < nFileCount)
+                  lstrcatA( lpstrTempFileList, " ");
+  }
+          lpstrTemp += strlen(lpstrFileList) + 1;
+      }
+  }
+
+      if ( fodInfos->ofnInfos->Flags & OFN_EXPLORER )
+      {
+      lstrcpyA( lpstrFile, lpstrPathSpec);
+      memcpy( lpstrFile + sizePath + 1, lpstrFileList, sizeof(CHAR) * sizeUsed );
+      }
+      else
+      {
+      memcpy( lpstrFile, lpstrTempFileList, sizeof(CHAR) * strlen(lpstrTempFileList));
+      }
+
+      fodInfos->ofnInfos->nFileOffset = sizePath + 1;
+      fodInfos->ofnInfos->nFileExtension = 0;
+
+  /* clean and exit */
+  return EndDialog(hwnd,TRUE);
+}
+
+/***********************************************************************
  *      FILEDLG95_OnOpen
  *
@@ -1105 +1193 @@
 BOOL FILEDLG95_OnOpen(HWND hwnd)
 {
-  char lpstrSpecifiedByUser[MAX_PATH];
+  CHAR lpstrSpecifiedByUser[MAX_PATH] = "";
+  CHAR lpstrFileList[MAX_PATH] = "";
+  LPSTR lpstrFile;
+  UINT nStrCharCount = 0;
+  UINT nFileCount = 0;
+  UINT nFileIndex = 0;
+  UINT sizeUsed = 0;
+  UINT nStrLen = 0;
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-  LPITEMIDLIST pidlSelection;
-
-  lpstrSpecifiedByUser[0]='\0';
 
   TRACE("\n");
-
-  /* Check if there is a selected item in the listview */
-  if(fodInfos->DlgInfos.dwDlgProp & FODPROP_USEVIEW)
-  {
-      pidlSelection = GetSelectedPidl(fodInfos->Shell.FOIShellView);
-      GetName(fodInfos->Shell.FOIShellFolder,pidlSelection,SHGDN_NORMAL,lpstrSpecifiedByUser);
-      COMDLG32_SHFree((LPVOID)pidlSelection);
-  }
-  else
-      /* Get the text from the filename edit */
-      GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrSpecifiedByUser,MAX_PATH);
-
-  if(strlen(lpstrSpecifiedByUser))
+//CB: optimize this function!
+  /* If a folder is selected browse folder */
+  if (BrowseSelectedFolder(hwnd))
+      return FALSE;
+
+  lpstrFile = fodInfos->ofnInfos->lpstrFile;
+
+  GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrSpecifiedByUser, MAX_PATH);
+  nStrLen = strlen(lpstrSpecifiedByUser);
+
+  while ( nStrCharCount <= nStrLen )
+  {
+      if ( lpstrSpecifiedByUser[nStrCharCount]=='"' )
+      {
+          nStrCharCount++;
+
+          while ((lpstrSpecifiedByUser[nStrCharCount]!='"') &&
+              (nStrCharCount <= nStrLen))
+  {
+              lpstrFileList[nFileIndex++] = lpstrSpecifiedByUser[nStrCharCount];
+              nStrCharCount++;
+              sizeUsed++;
+  }
+          lpstrFileList[nFileIndex++] = '\0';
+          sizeUsed++;
+          nFileCount++;
+      }
+      nStrCharCount++;
+  }
+
+  if(nFileCount > 0)
+      return FILEDLG95_OnOpenMultipleFiles(hwnd, lpstrFileList, nFileCount, sizeUsed);
+
+  if (nStrLen)
   {
       LPSHELLFOLDER psfDesktop;
@@ -1130 +1244 @@
       LPSTR lpstrFileSpec;
       LPSTR lpstrTemp;
-      char lpstrPathSpec[MAX_PATH];
-      char lpstrCurrentDir[MAX_PATH];
-      char lpstrPathAndFile[MAX_PATH];
-
-      lpstrPathSpec[0]    = '\0';
-      lpstrCurrentDir[0]  = '\0';
-      lpstrPathAndFile[0] = '\0';
+      char lpstrPathSpec[MAX_PATH] = "";
+      char lpstrCurrentDir[MAX_PATH] = "";
+      char lpstrPathAndFile[MAX_PATH] = "";
 
       /* Separate the file spec from the path spec
@@ -1143 +1253 @@
               C:\TEXT1\TEXT2        C:\TEXT1          TEXT2
       */
+      if (nFileCount == 0)
+      {
       lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrSpecifiedByUser);
       strcpy(lpstrPathSpec,lpstrSpecifiedByUser);
       COMDLG32_PathRemoveFileSpecA(lpstrPathSpec);
+      }
 
       /* Get the index of the selected item in the filetype combo box */
-      fodInfos->ofnInfos.nFilterIndex = (DWORD) CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
+      fodInfos->ofnInfos->nFilterIndex = (DWORD) CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
       /* nFilterIndex is 1 based while combo GetCurSel return zero based index */
-      fodInfos->ofnInfos.nFilterIndex++;
+      fodInfos->ofnInfos->nFilterIndex++;
 
       /* Get the current directory name */
@@ -1164 +1277 @@
           case '\\':
               {
-              int lenPathSpec=strlen(lpstrPathSpec);
-              INT iCopy = (lenPathSpec!=0?2:3);
-              memmove(lpstrPathSpec+iCopy,lpstrPathSpec,lenPathSpec);
-              strncpy(lpstrPathSpec,lpstrCurrentDir,iCopy);
+                  INT iCopy = 2;
+                  char lpstrTmp[MAX_PATH] = "";
+                  if(!strlen(lpstrPathSpec))
+                      iCopy = 3;
+                  strncpy(lpstrTmp,lpstrCurrentDir,iCopy);
+                  strcat(lpstrTmp,lpstrPathSpec);
+                  strcpy(lpstrPathSpec,lpstrTmp);
               }
               break;
@@ -1174 +1290 @@
               {
                   INT iSize;
-                  char lpstrTmp2[MAX_PATH];
+                  char lpstrTmp2[MAX_PATH] = "";
                   LPSTR lpstrTmp = strrchr(lpstrCurrentDir,'\\');
-
                   iSize = lpstrTmp - lpstrCurrentDir;
                   strncpy(lpstrTmp2,lpstrCurrentDir,iSize + 1);
                   if(strlen(lpstrSpecifiedByUser) <= 3)
-                  *lpstrFileSpec='\0';
+                      strcpy(lpstrFileSpec,"");
                   if(strcmp(lpstrPathSpec,".."))
                       strcat(lpstrTmp2,&lpstrPathSpec[3]);
@@ -1188 +1303 @@
           default:
   {
-                  char lpstrTmp[MAX_PATH];
-
+                  char lpstrTmp[MAX_PATH] = "";
                   if(strcmp(&lpstrCurrentDir[strlen(lpstrCurrentDir)-1],"\\"))
                       strcat(lpstrCurrentDir,"\\");
@@ -1216 +1330 @@
           {
               /* Path does not exist */
-              if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+              if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
               {
                   MessageBoxA(hwnd,
                               "Path does not exist",
-                              fodInfos->ofnInfos.lpstrTitle,
+                              fodInfos->ofnInfos->lpstrTitle,
                               MB_OK | MB_ICONEXCLAMATION);
                   return FALSE;
@@ -1273 +1387 @@
     }
 
+      {
+       HANDLE hFile;
+       WIN32_FIND_DATAA stffile;
       /* browse if the user specified a directory */
+       hFile = FindFirstFileA(lpstrFileSpec, &stffile);
+       if ( hFile != INVALID_HANDLE_VALUE )
+       {
+        FindClose (hFile);
+        if (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
       browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
               lpstrFileSpec);
+        else
+        {
+         // if there is an extention, then get the Pidl otherwise
+         // we are going to need to add the extention
+         if(strrchr(lpstrFileSpec,'.'))
+          browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
+                lpstrFileSpec);
+         else
+          browsePidl=NULL;
+        }
+       }
+       else
+        browsePidl=NULL;
+      }
+
       if (!browsePidl) /* not a directory check the specified file exists */
       {
+       int i;
           int iExt;
           char lpstrFileSpecTemp[MAX_PATH] = "";
@@ -1285 +1423 @@
           iExt = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
           lpOrg = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iExt);
+          if (lpOrg == (LPSTR)-1)
+              lpOrg = NULL;     // we get -1 if the filetype LB is empty
+
           lpstrExt = lpOrg;
 
           /*
-             add user specified extentions to the file one by one and
-             check if the file exists
+          Simply take the first one of the list as default.
+          Otherwise the user must specify which extention they want.
+          Also, make sure we don't have a .*, in this case simply
+          forget about the extention
          */
-          while(lpOrg)
-         {
-             int i;
              lpstrExt = strchr(lpOrg, ';');
              if (lpstrExt)
@@ -1309 +1449 @@
                  if (strchr(lpBuf, '.'))
                      strcat(lpstrFileSpecTemp, (strchr(lpBuf, '.')) + 1);
-             } else {
-                 if (strchr(lpBuf, '.'))
-                     strcat(lpstrFileSpecTemp, strchr(lpBuf, '.'));
              }
+             else
+                 strcat(lpstrFileSpecTemp, strchr(lpBuf, '.'));
              browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
                      lpstrFileSpecTemp);
              MemFree((void *)lpBuf);
              if (browsePidl)
-             {
                  strcpy(lpstrFileSpec,lpstrFileSpecTemp);
-                 break;
-             }
              if (lpstrExt)
                  lpOrg = lpstrExt+1;
              else
                  lpOrg = NULL;
-         }
       }
 
@@ -1346 +1481 @@
                                                    SBSP_RELATIVE)))
         {
-                  if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+                  if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
         {
                       MessageBoxA(hwnd,
                                   "Path does not exist",
-                                  fodInfos->ofnInfos.lpstrTitle,
+                                  fodInfos->ofnInfos->lpstrTitle,
                                   MB_OK | MB_ICONEXCLAMATION);
                       COMDLG32_SHFree(browsePidl);
@@ -1362 +1497 @@
           /* The file does exist, so ask the user if we should overwrite it */
           if((fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) &&
-             (fodInfos->ofnInfos.Flags & OFN_OVERWRITEPROMPT))
+             (fodInfos->ofnInfos->Flags & OFN_OVERWRITEPROMPT))
           {
                 strcpy(lpstrFileExist, lpstrFileSpec);
@@ -1369 +1504 @@
                 nMsgBoxRet = MessageBoxA(hwnd,
                                         lpstrFileExist,
-                                        fodInfos->ofnInfos.lpstrTitle,
+                                        fodInfos->ofnInfos->lpstrTitle,
                                         MB_YESNO | MB_ICONEXCLAMATION);
                 if (nMsgBoxRet == IDNO)
@@ -1385 +1520 @@
           /* The selected file does not exist */
       /* Tell the user the selected does not exist */
-      if(fodInfos->ofnInfos.Flags & OFN_FILEMUSTEXIST)
+      if(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)
       {
         char lpstrNotFound[100];
@@ -1400 +1535 @@
                           100);
 
-        strcpy(tmp,fodInfos->ofnInfos.lpstrFile);
+        strcpy(tmp,fodInfos->ofnInfos->lpstrFile);
         strcat(tmp,"\n");
         strcat(tmp,lpstrNotFound);
@@ -1408 +1543 @@
               MessageBoxA(hwnd,
                           tmp,
-                          fodInfos->ofnInfos.lpstrTitle,
+                          fodInfos->ofnInfos->lpstrTitle,
                           MB_OK | MB_ICONEXCLAMATION);
         return FALSE;
       }
       /* Ask the user if he wants to create the file*/
-      if(fodInfos->ofnInfos.Flags & OFN_CREATEPROMPT)
+      if(fodInfos->ofnInfos->Flags & OFN_CREATEPROMPT)
       {
         char tmp[100];
@@ -1419 +1554 @@
         LoadStringA(COMMDLG_hInstance32,IDS_CREATEFILE,tmp,100);
 
-              if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos.lpstrTitle,
+              if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos->lpstrTitle,
                                       MB_YESNO | MB_ICONQUESTION))
         {
             /* Create the file, clean and exit */
-            FILEDLG95_Clean(hwnd);
             return EndDialog(hwnd,TRUE);
         }
@@ -1429 +1563 @@
       }
     }
+      /* check the write access to the current directory before opening the selected file */
+      if((fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && (fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST))
+      {
+          HANDLE hfile;
+          char testFile[MAX_PATH];
+
+          strcpy(testFile,lpstrPathSpec);
+          strcat(testFile,"_tes_13.579");
+
+          hfile = CreateFileA(testFile,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,0);
+
+          switch(GetLastError())
+          {
+          case ERROR_ACCESS_DENIED:
+          case ERROR_WRITE_PROTECT:
+          case ERROR_PATH_NOT_FOUND:
+          case ERROR_FILE_NOT_FOUND:
+              {
+                  char strAccessDenied[MAX_PATH + 100];
+                  strcpy(strAccessDenied,lpstrPathSpec);
+                  strcat(strAccessDenied,lpstrFileSpec);
+                  strcat(strAccessDenied,"\nWrite access denied for this file !");
+                  MessageBoxA(hwnd,strAccessDenied,fodInfos->ofnInfos->lpstrTitle,MB_OK | MB_ICONEXCLAMATION);
+                  return FALSE;
+              }
+          }
+
+          if (hfile != INVALID_HANDLE_VALUE)
+          {
+              CloseHandle(hfile);
+              DeleteFileA(testFile);
+          }
+
+      }
 
       /* Open the selected file */
@@ -1457 +1625 @@
               }
 
-              if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt)
-              {
-                  lpstrExt = MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+2);
-                  strcat(lpstrExt,".");
-                  strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt);
+               if(strcmp(lpstrExt,".*") != 0)
+               {
+                  /* OPEN DIALOG: Let's see if the file exists with the current extention,
+                     if not return the file without the extention.
+                     SAVE DIALOG: Concatenate the extention to the file.
+                  */
+
+                  if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG))
+                  {
+                        LPSTR lpstrFindFile;
+                        WIN32_FIND_DATAA fd;
+
+                        lpstrFindFile = MemAlloc(strlen(lpstrPathAndFile)+strlen(lpstrExt));
+                        strcpy(lpstrFindFile, lpstrPathAndFile);
+                        strcat(lpstrFindFile, lpstrExt);
+                        if(FindFirstFileA(lpstrFindFile, &fd) != INVALID_HANDLE_VALUE)
+                                strcat(lpstrPathAndFile,lpstrExt);
+                        MemFree(lpstrFindFile);
+                  }
+                  else
+                        strcat(lpstrPathAndFile,lpstrExt);
               }
-              strcat(lpstrPathAndFile,lpstrExt);
+              MemFree( lpstrExt );
           }
       }
       /* Check that size size of the file does not exceed buffer size */
-      if(strlen(lpstrPathAndFile) > fodInfos->ofnInfos.nMaxFile)
+      if(strlen(lpstrPathAndFile) > fodInfos->ofnInfos->nMaxFile)
       {
           /* set error FNERR_BUFFERTOSMALL */
-          FILEDLG95_Clean(hwnd);
           return EndDialog(hwnd,FALSE);
       }
-      strcpy(fodInfos->ofnInfos.lpstrFile,lpstrPathAndFile);
+      strcpy(fodInfos->ofnInfos->lpstrFile,lpstrPathAndFile);
+         fodInfos->ofnInfos->lpstrFile[strlen(lpstrPathAndFile)] = '\0';
+         fodInfos->ofnInfos->lpstrFile[strlen(lpstrPathAndFile)+1] = '\0';
 
       /* Set the lpstrFileTitle of the OPENFILENAME structure */
-      if(fodInfos->ofnInfos.lpstrFileTitle)
-          strncpy(fodInfos->ofnInfos.lpstrFileTitle,
+      if(fodInfos->ofnInfos->lpstrFileTitle)
+          strncpy(fodInfos->ofnInfos->lpstrFileTitle,
                   lpstrFileSpec,
-                  fodInfos->ofnInfos.nMaxFileTitle);
+                  fodInfos->ofnInfos->nMaxFileTitle);
 
       /* Check if the file is to be opened as read only */
@@ -1485 +1670 @@
                                             IDC_OPENREADONLY,
                                             BM_GETSTATE,0,0))
-          SetFileAttributesA(fodInfos->ofnInfos.lpstrFile,
+          SetFileAttributesA(fodInfos->ofnInfos->lpstrFile,
                              FILE_ATTRIBUTE_READONLY);
 
       /*  nFileExtension and nFileOffset of OPENFILENAME structure */
-      lpstrTemp = strrchr(fodInfos->ofnInfos.lpstrFile,'\\');
-      fodInfos->ofnInfos.nFileOffset = lpstrTemp - fodInfos->ofnInfos.lpstrFile + 1;
-      lpstrTemp = strrchr(fodInfos->ofnInfos.lpstrFile,'.');
-      fodInfos->ofnInfos.nFileExtension = lpstrTemp - fodInfos->ofnInfos.lpstrFile + 1;
+      lpstrTemp = strrchr(fodInfos->ofnInfos->lpstrFile,'\\');
+      fodInfos->ofnInfos->nFileOffset = lpstrTemp - fodInfos->ofnInfos->lpstrFile + 1;
+      lpstrTemp = strrchr(fodInfos->ofnInfos->lpstrFile,'.');
+      fodInfos->ofnInfos->nFileExtension = lpstrTemp - fodInfos->ofnInfos->lpstrFile + 1;
 
 
     /* clean and exit */
-    FILEDLG95_Clean(hwnd);
     return EndDialog(hwnd,TRUE);
   }
@@ -1527 +1711 @@
   fodInfos->ShellInfos.hwndOwner = hwnd;
 
-  fodInfos->ShellInfos.folderSettings.fFlags = FWF_AUTOARRANGE | FWF_ALIGNLEFT;
+  fodInfos->ShellInfos.folderSettings.fFlags = 0;
+  /* Disable multi-select if flag not set */
+  if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
+  {
+     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
+  }
+  fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
   fodInfos->ShellInfos.folderSettings.ViewMode = FVM_LIST;
 
@@ -1654 +1844 @@
       char lpstrText[128+MAX_PATH];
       char lpstrTempText[128];
-      char lpstrCaption[256];
+      char lpstrCaption[32];
 
       /* Cannot Create folder because of permissions */
@@ -1695 +1885 @@
   TRACE("\n");
 
-  if(fodInfos->ofnInfos.lpstrFilter)
+  if(fodInfos->ofnInfos->lpstrFilter)
   {
     int iStrIndex = 0;
@@ -1712 +1902 @@
 
       /* Get the title */
-      lpstrTmp = (&((LPBYTE)fodInfos->ofnInfos.lpstrFilter)[iStrIndex]);
+      lpstrTmp = (&((LPBYTE)fodInfos->ofnInfos->lpstrFilter)[iStrIndex]);
       if(!strlen(lpstrTmp))
         break;
       iStrIndex += strlen(lpstrTmp) +1;
       /* Get the extension */
-      lpstrExtTmp = (&((LPBYTE)fodInfos->ofnInfos.lpstrFilter)[iStrIndex]);
+      lpstrExtTmp = (&((LPBYTE)fodInfos->ofnInfos->lpstrFilter)[iStrIndex]);
       if(!lpstrExtTmp)
           break;
@@ -1738 +1928 @@
 
       /* set default filter index */
-      if(fodInfos->ofnInfos.nFilterIndex == 0 && fodInfos->ofnInfos.lpstrCustomFilter == NULL)
-        fodInfos->ofnInfos.nFilterIndex = 1;
+      if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
+        fodInfos->ofnInfos->nFilterIndex = 1;
       /* First, check to make sure our index isn't out of bounds. */
-      if ( fodInfos->ofnInfos.nFilterIndex > iPos )
-        fodInfos->ofnInfos.nFilterIndex = iPos;
+      if ( fodInfos->ofnInfos->nFilterIndex > iPos )
+        fodInfos->ofnInfos->nFilterIndex = iPos;
 
 
       /* Get the current index selection. */
       CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB,
-                  fodInfos->ofnInfos.nFilterIndex-1);
+                  fodInfos->ofnInfos->nFilterIndex-1);
 
       /* Get the corresponding text string from the combo box. */
       lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
-                                             fodInfos->ofnInfos.nFilterIndex-1);
+                                             fodInfos->ofnInfos->nFilterIndex-1);
+
+      if ((INT)lpstrFilter == -1)
+        lpstrFilter = NULL;     // we get -1 if the control is empty
 
     if(lpstrFilter)
@@ -1774 +1967 @@
   switch(wNotifyCode)
   {
-    case CBN_CLOSEUP:
+    case CBN_SELENDOK:
     {
       LPSTR lpstrFilter;
@@ -1780 +1973 @@
       /* Get the current item of the filetype combo box */
       int iItem = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
+
+      /* set the current filter index - indexed from 1 */
+      fodInfos->ofnInfos->nFilterIndex = iItem + 1;
 
       /* Set the current filter with the current selection */
@@ -1870 +2066 @@
   CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON));
 
+#ifndef SHELL_NO_DESKTOP
   /* Initialise data of Desktop folder */
   COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidlTmp);
   FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
   COMDLG32_SHFree(pidlTmp);
+#endif
 
   COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DRIVES,&pidlDrives);
@@ -1934 +2132 @@
   int iIndentation;
   LPSFOLDER tmpFolder;
+  INT iIcon;
 
   LookInInfos *liInfos = (LookInInfos *)GetPropA(pDIStruct->hwndItem,LookInInfosStr);
@@ -1942 +2141 @@
     return 0;
 
-  if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(pDIStruct->hwndItem,
+  if((LPSFOLDER)CB_ERR == (tmpFolder = (LPSFOLDER) CBGetItemDataPtr(pDIStruct->hwndItem,
                             pDIStruct->itemID)))
     return 0;
@@ -1957 +2156 @@
                                                   &sfi,
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME);
+                                                  SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME);
     len = strlen(sfi.szDisplayName)+1;
     tmpFolder->szDisplayName = MemAlloc(len);
@@ -1963 +2162 @@
     tmpFolder->iIcon = sfi.iIcon;
   }
+
+  if((pDIStruct->itemID == liInfos->uSelectedItem) || (pDIStruct->itemState & ODS_COMBOBOXEDIT))
+  {
+    if (!tmpFolder->iSelIcon)
+    {
+      SHFILEINFOA sfi2;
+
+      COMDLG32_SHGetFileInfoA((LPCSTR)tmpFolder->pidlItem,0,&sfi2,sizeof(SHFILEINFOA),
+                              SHGFI_PIDL | SHGFI_SMALLICON |
+                              SHGFI_OPENICON | SHGFI_SYSICONINDEX);
+      tmpFolder->iSelIcon = sfi2.iIcon;
+    }
+    iIcon = tmpFolder->iSelIcon;
+  } else iIcon = tmpFolder->iIcon;
+
 
   /* Is this item selected ?*/
@@ -2001 +2215 @@
   /* Draw the icon from the image list */
   COMDLG32_ImageList_Draw(tmpFolder->ilItemImage,
-                 tmpFolder->iIcon,
+                 iIcon,
                  pDIStruct->hDC,
                  rectIcon.left,
@@ -2029 +2243 @@
   switch(wNotifyCode)
   {
-  case CBN_CLOSEUP:
+  case CBN_SELENDOK:
     {
       LPSFOLDER tmpFolder;
@@ -2064 +2278 @@
   LPITEMIDLIST pidlNext;
   SHFILEINFOA sfi;
-  SFOLDER *tmpFolder = MemAlloc(sizeof(SFOLDER));
+  SFOLDER *tmpFolder;
   LookInInfos *liInfos;
 
   TRACE("\n");
+
+  if(!pidl)
+    return -1;
 
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
 
+  tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
   tmpFolder->szDisplayName = NULL;
-
-  if(!pidl)
-    return -1;
 
   /* Calculate the indentation of the item in the lookin*/
@@ -2094 +2309 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_ATTRIBUTES);
+                  SHGFI_PIDL | SHGFI_ATTRIBUTES);
 
   if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
@@ -2115 +2330 @@
   }
 
+  MemFree(tmpFolder);
   return -1;
-
 }
 
@@ -2433 +2648 @@
     }
 }
+
+/***********************************************************************
+ *      BrowseSelectedFolder
+ *
+ */
+static BOOL BrowseSelectedFolder(HWND hwnd)
+{
+  BOOL bBrowseSelFolder = FALSE;
+
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+
+  if (GetNumSelected(fodInfos->Shell.FOIShellView) == 1)
+  {
+      LPITEMIDLIST pidlSelection;
+      ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
+
+      /* get the file selected */
+      EnumSelectedPidls( fodInfos->Shell.FOIShellView, 0, &pidlSelection );
+      IShellFolder_GetAttributesOf( fodInfos->Shell.FOIShellFolder, 1, &pidlSelection, &uAttr );
+      if ( uAttr & SFGAO_FOLDER )
+      {
+          if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser,
+                          pidlSelection, SBSP_RELATIVE ) ) )
+          {
+               MessageBoxA( hwnd, "Path does not exist", fodInfos->ofnInfos->lpstrTitle,
+                       MB_OK | MB_ICONEXCLAMATION );
+          }
+
+          bBrowseSelFolder = TRUE;
+      }
+      COMDLG32_SHFree( pidlSelection );
+  }
+
+  return bBrowseSelFolder;
+}
+