Changeset 5583 for trunk/src/comdlg32/filedlgbrowser.c

Timestamp:

Apr 24, 2001, 10:37:25 PM (25 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comdlg32/filedlgbrowser.c (modified) (10 diffs)

trunk/src/comdlg32/filedlgbrowser.c

@@ -5 +5 @@
  */
 
+#include <stdio.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "heap.h"
+#include "debugtools.h"
+
+#include "shlwapi.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "shlguid.h"
+#include "wine/obj_serviceprovider.h"
+
 #ifdef __WIN32OS2__
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
 #include <heapstring.h>
 #include <misc.h>
-
 #endif
-
-#include <stdio.h>
-#include "unknwn.h"
-#include "filedlgbrowser.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/winestring.h"
-#include "heap.h"
-#include "shlguid.h"
-#include "wine/obj_dataobject.h"
-#include "debugtools.h"
-#include "cdlg.h"
-
-#define INITGUID
-#include "initguid.h"
-#include "wine/obj_serviceprovider.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
@@ -84 +79 @@
  *   Helper functions
  */
+
+static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos)
+{
+    char lpstrPath[MAX_PATH];
+    SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
+    SetCurrentDirectoryA(lpstrPath);
+    TRACE("new current folder %s\n", lpstrPath);
+}
 
 /* copied from shell32 to avoid linking to it */
@@ -98 +101 @@
 
           case STRRET_CSTRA:
-            lstrcpynAtoW((LPWSTR)dest, src->u.cStr, len);
+            if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len ))
+                ((LPWSTR)dest)[len-1] = 0;
             break;
 
@@ -104 +108 @@
             if (pidl)
             {
-              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+                if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset,
+                                                 -1, (LPWSTR)dest, len ))
+                    ((LPWSTR)dest)[len-1] = 0;
             }
             break;
@@ -111 +117 @@
             FIXME("unknown type!\n");
             if (len)
-            { *(LPSTR)dest = '\0';
+            { *(LPWSTR)dest = '\0';
             }
             return(FALSE);
@@ -140 +146 @@
     sb->lpVtblCommDlgBrowser = &IShellBrowserImpl_ICommDlgBrowser_Vtbl;
     sb->lpVtblServiceProvider = &IShellBrowserImpl_IServiceProvider_Vtbl;
-    COMDLG32_SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
+    SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
                                &fodInfos->ShellInfos.pidlAbsCurrent);
 
@@ -157 +163 @@
     ICOM_THIS(IShellBrowserImpl, iface);
 
-#ifndef __WIN32OS2__
     TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid));
-#endif
 
     *ppvObj = NULL;
@@ -376 +380 @@
     COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
     fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp;
+
+    COMDLG32_UpdateCurrentDir(fodInfos);
 
     /* Create the window */
@@ -791 +797 @@
       if (SUCCEEDED(COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)))
       {
-          if (COMDLG32_PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
+          if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
           return S_OK;
       }
@@ -905 +911 @@
     _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
 
-#ifndef __WIN32OS2__
     FIXME("(%p)\n\t%s\n\t%s\n", This,debugstr_guid(guidService), debugstr_guid(riid) );
-#endif
 
     *ppv = NULL;