Changeset 1556 for trunk/src/comdlg32/filedlgbrowser.cpp

Timestamp:

Nov 2, 1999, 9:37:43 PM (26 years ago)

Author:

sandervl

Message:

Wine 991031 update

File:

• trunk/src/comdlg32/filedlgbrowser.cpp (modified) (15 diffs)

trunk/src/comdlg32/filedlgbrowser.cpp

@@ -1 @@
-/* $Id: filedlgbrowser.cpp,v 1.1 1999-11-02 19:09:42 sandervl Exp $ */
 /*
- *  Implementation of IShellBrowser for the File Open common dialog (990815)
+ *  Implementation of IShellBrowser for the File Open common dialog
  * 
  *
  */
+
+#include <stdio.h>
+#ifdef __WIN32OS2__
 // ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
 #define CINTERFACE 1
-
-#include <stdio.h>
+#include <os2win.h>
 #include "unknwn.h"
-#include <os2win.h>
 #include "filedlgbrowser.h"
+#else
+#include "unknwn.h"
+#include "filedlgbrowser.h"
+#include "winuser.h"
+#endif
 #include "heap.h"
-#include "commctrl.h"
 #include "wine/obj_dataobject.h"
 #include "debugtools.h"
@@ -77 +81 @@
 
 HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
+#if 0
 LPITEMIDLIST GetSelectedPidl(IShellView *ppshv);
+#endif
 
 /**************************************************************************
@@ -116 +122 @@
     sb->lpVtbl2 = &IShellBrowserImpl_ICommDlgBrowser_Vtbl;
 
-    SHGetSpecialFolderLocation(hwndOwner,
+    COMDLG32_SHGetSpecialFolderLocation(hwndOwner,
                                CSIDL_DESKTOP,
                                &fodInfos->ShellInfos.pidlAbsCurrent);
@@ -194 +200 @@
     if (!--(This->ref)) 
     { 
-      SHFree(This);
+      COMDLG32_SHFree(This);
       return 0;
     }
@@ -287 +293 @@
         }
         /* create an absolute pidl */
-        pidlTmp = ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
+        pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
                                                         (LPITEMIDLIST)pidl);
         
@@ -302 +308 @@
     {
         /* An absolute pidl (relative from the desktop) */
-        pidlTmp = ILClone((LPITEMIDLIST)pidl);
+        pidlTmp =  COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl);
         psfTmp = GetShellFolderFromPidl(pidlTmp);
     }
 
+    
     /* Retrieve the IShellFolder interface of the pidl specified folder */
     if(!psfTmp)
         return E_FAIL;
+
+    /* 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);
+        return NOERROR;
+    }
 
     /* Release the current fodInfos->Shell.FOIShellFolder and update its value */
@@ -349 +365 @@
 
             /* Release old pidlAbsCurrent memory and update its value */
-            SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
+            COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
             fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp;
 
@@ -626 +642 @@
         HRESULT hRes;
 
-        /* Selected item is a directory so browse to it */
-
         ULONG  ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
         IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
@@ -634 +648 @@
         /* Tell the dialog that the user selected a file */
         else
+        {
             hRes = FILEDLG95_OnOpen(This->hwndOwner);
+        }
 
         /* Free memory used by pidl */
-        SHFree((LPVOID)pidl);
+        COMDLG32_SHFree((LPVOID)pidl);
 
         return hRes;
@@ -662 +678 @@
             break;
         case CDBOSC_KILLFOCUS: 
+            {
+                FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
+                if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+                    SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+            }
             break;
         case CDBOSC_SELCHANGE:
@@ -705 +726 @@
 
     if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_FORPARSING, &str)))
-    { if (SUCCEEDED(StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)))
+    { if (SUCCEEDED(StrRetToBufW(&str, pidl,szPathW, MAX_PATH)))
       {
-        if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
+          if (COMDLG32_PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
           return S_OK;
       }
@@ -721 +742 @@
 {
     LPITEMIDLIST pidl;
-
+    FileOpenDlgInfos *fodInfos;
     _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface);
 
+    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
     TRACE("(%p)\n", This);
 
@@ -731 +753 @@
         char lpstrFileName[MAX_PATH];
     
-        FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
-
         ULONG  ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
         IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
@@ -739 +759 @@
             if(SUCCEEDED(hRes = GetName(fodInfos->Shell.FOIShellFolder,pidl,SHGDN_NORMAL,lpstrFileName)))
                 SetWindowTextA(fodInfos->DlgInfos.hwndFileName,lpstrFileName);
+            if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+                    SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
         }
-
-        SHFree((LPVOID)pidl);
+        else
+            SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Open");
+
+        fodInfos->DlgInfos.dwDlgProp |= FODPROP_USEVIEW;
+
+        COMDLG32_SHFree((LPVOID)pidl);
         return hRes;
     }
-
+    if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+        SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+
+    fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
     return E_FAIL;
 }
@@ -780 +809 @@
             LPIDA cida = (LPIDA)GlobalLock(medium.u.hGlobal);
             TRACE("cida=%p\n", cida);
-            pidlSelected = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[1]]));
+            pidlSelected =  COMDLG32_PIDL_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[1]]));
 
             if(medium.pUnkForRelease)