Changeset 3193 for trunk/src/shell32/shlfolder.cpp

Timestamp:

Mar 22, 2000, 5:55:52 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/shell32/shlfolder.cpp (modified) (6 diffs)

trunk/src/shell32/shlfolder.cpp

@@ -1 @@
-/* $Id: shlfolder.cpp,v 1.6 2000-01-08 04:37:01 phaller Exp $ */
+/* $Id: shlfolder.cpp,v 1.7 2000-03-22 16:55:52 cbratschi Exp $ */
 /*
  * Shell Folder stuff
@@ -177 +177 @@
    pdump(pidl);
 
-   if ((pidlFirst = ILCloneFirst(pidl)))
+   pidlFirst = ILCloneFirst(pidl);
+   if (pidlFirst)
    {
      hr = IShellFolder_BindToObject(psf, pidlFirst, NULL, &IID_IShellFolder, (LPVOID*)&psfChild);
@@ -562 +563 @@
    *ppvOut = NULL;
 
-   if ((iid=_ILGetGUIDPointer(pidl)))
+   iid = _ILGetGUIDPointer(pidl);
+   if (iid)
    {
      /* we have to create a alien folder */
@@ -1317 +1319 @@
    *ppvOut = NULL;
 
-   if ((clsid=_ILGetGUIDPointer(pidl)))
+   clsid = _ILGetGUIDPointer(pidl);
+   if (clsid)
    {
      if ( IsEqualIID(clsid, &IID_MyComputer))
@@ -1419 +1422 @@
      pdump (*apidl);
 
-     if ((clsid=_ILGetGUIDPointer(*apidl)))
+     clsid = _ILGetGUIDPointer(*apidl);
+     if (clsid)
      {
        if (IsEqualIID(clsid, &IID_MyComputer))
@@ -1871 +1875 @@
        *rgfInOut &= 0xf0000144;
        goto next;
-     }
-     else if ((clsid=_ILGetGUIDPointer(*apidl)))
-     {
-       if (HCR_GetFolderAttributes(clsid, &attributes))
+     } else
+     {
+       clsid = _ILGetGUIDPointer(*apidl);
+       if (clsid)
        {
-         *rgfInOut &= attributes;
-         goto next;
+         if (HCR_GetFolderAttributes(clsid, &attributes))
+         {
+           *rgfInOut &= attributes;
+           goto next;
+         }
        }
      }