Author: dreimer
Date: Sat Jan 17 13:59:22 2009
New Revision: 38842
URL:
http://svn.reactos.org/svn/reactos?rev=38842&view=rev
Log:
Sync Apps to wine HEAD (1 of 2)
Modified:
trunk/rosapps/applications/winfile/winefile.c
Modified: trunk/rosapps/applications/winfile/winefile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef…
==============================================================================
--- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Sat Jan 17 13:59:22 2009
@@ -3781,8 +3781,15 @@
scan_entry(child, &child->root.entry, 0, child->hwnd);
#ifdef _SHELL_FOLDERS
+
if (child->root.entry.etype == ET_SHELL)
- entry = read_tree(&child->root, NULL, get_path_pidl(path,child->hwnd), drv,
child->sortOrder, child->hwnd);
+ {
+ LPITEMIDLIST local_pidl = get_path_pidl(path,child->hwnd);
+ if (local_pidl)
+ entry = read_tree(&child->root, NULL, local_pidl , drv, child->sortOrder,
child->hwnd);
+ else
+ entry = NULL;
+ }
else
#endif
entry = read_tree(&child->root, path, NULL, drv, child->sortOrder,
child->hwnd);