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

Timestamp:

Mar 28, 2000, 5:28:54 PM (25 years ago)

Author:

cbratschi

Message:

floppy name resource, release fix (don't use pdump)

File:

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

trunk/src/shell32/shlfolder.cpp

@@ -1 @@
-/* $Id: shlfolder.cpp,v 1.10 2000-03-27 15:09:21 cbratschi Exp $ */
+/* $Id: shlfolder.cpp,v 1.11 2000-03-28 15:28:53 cbratschi Exp $ */
 /*
  * Shell Folder stuff
@@ -114 +114 @@
    /* get the shellfolder for the child pidl and let it analyse further */
    hr = IShellFolder_BindToObject(psf, *pidlInOut, NULL, &IID_IShellFolder, (LPVOID*)&psfChild);
-dprintf(("C 1"));
+
    if (psfChild)
    {  dprintf(("C 1a %d",psfChild/*,(psfChild)->fnParseDisplayName()*/));
      hr = IShellFolder_ParseDisplayName(psfChild, hwndOwner, NULL, szNext, pEaten, &pidlOut, pdwAttributes);
-dprintf(("C 1b"));
+
      IShellFolder_Release(psfChild);
-dprintf(("C 2"));
      pidlTemp = ILCombine(*pidlInOut, pidlOut);
-dprintf(("C 3"));
      if (pidlOut)
        ILFree(pidlOut);
    }
-dprintf(("C 4"));
+
    ILFree(*pidlInOut);
    *pidlInOut = pidlTemp;
@@ -798 +796 @@
    {
      LPPIDLDATA pd1, pd2;
+
      pd1 = _ILGetDataPointer(pidl1);
      pd2 = _ILGetDataPointer(pidl2);
@@ -2099 +2098 @@
        if ((szPath[0] == 'A') || (szPath[0] == 'a') || (szPath[0] == 'B') || (szPath[0] == 'b'))
        {
-//CB: todo: move to resource, German name is "3,5-Diskette" -> English "3.5-Disk"?
-         strcpy(szDrive,"Floppy drive");
+         //floppy
+         strncpy(szDrive,szPath,2);
+         //3.5 floppy
+         LoadStringA(shell32_hInstance,IDS_35FLOPPY,szPath,sizeof(szPath)-10);
+         //CB: todo: 5.25 floppy check
+         strcat(szPath," (");
+         strncat(szPath,szDrive,2);
+         strcat(szPath,")");
        } else
        {
          GetVolumeInformationA(szPath,szDrive,12,&dwVolumeSerialNumber,&dwMaximumComponetLength,&dwFileSystemFlags,NULL,0);
+         strcat (szDrive," (");
+         strncat (szDrive, szPath, 2);
+         strcat (szDrive,")");
+         strcpy (szPath, szDrive);
        }
-       strcat (szDrive," (");
-       strncat (szDrive, szPath, 2);
-       strcat (szDrive,")");
-       strcpy (szPath, szDrive);
      }
    }