Changeset 4706 for trunk/src/shell32/folders.c

Timestamp:

Nov 28, 2000, 12:00:47 PM (25 years ago)

Author:

sandervl

Message:

KS: icon index fix

File:

• trunk/src/shell32/folders.c (modified) (11 diffs)

trunk/src/shell32/folders.c

@@ -1 @@
-/* $Id: folders.c,v 1.6 2000-11-27 10:21:59 sandervl Exp $ */
+/* $Id: folders.c,v 1.7 2000-11-28 11:00:47 sandervl Exp $ */
 /*
  *  Copyright 1997  Marcus Meissner
@@ -156 +156 @@
       lstrcpynA(szIconFile, "shell32.dll", cchMax);
 #ifdef __WIN32OS2__
-      *piIndex = SHLICON_DESKTOP - 1;
+      *piIndex = SHLICON_DESKTOP;
 #else
       *piIndex = 34;
@@ -194 +194 @@
 #ifdef __WIN32OS2__
       lstrcpynA(szIconFile, "shell32.dll", cchMax);
-      *piIndex = SHLICON_HARDDISK - 1;
+      *piIndex = SHLICON_HARDDISK;
 
       if ( _ILGetDrive( pSimplePidl, sTemp, cchMax ) )
@@ -202 +202 @@
         {
             /* FIXME determine 5.25 Floppy */
-            *piIndex = SHLICON_FLOPPY35 - 1;
+            *piIndex = SHLICON_FLOPPY35;
         }
         else
@@ -210 +210 @@
             {
                 case DRIVE_REMOVABLE:
-                    *piIndex = SHLICON_REMOVABLE_DISK - 1;
+                    *piIndex = SHLICON_REMOVABLE_DISK;
                     break;
 
                 case DRIVE_FIXED:
-                    *piIndex = SHLICON_HARDDISK - 1;
+                    *piIndex = SHLICON_HARDDISK;
                     break;
 
@@ -222 +222 @@
                     BOOL connected = TRUE;
                     if ( connected )
-                        *piIndex = SHLICON_NETDRIVE_CONN - 1;
+                        *piIndex = SHLICON_NETDRIVE_CONN;
                     else
-                        *piIndex = SHLICON_NETDRIVE_DISCON - 1;
+                        *piIndex = SHLICON_NETDRIVE_DISCON;
                     break;
                 }
                 case DRIVE_CDROM:
-                    *piIndex = SHLICON_CDROM_DRIVE - 1;
+                    *piIndex = SHLICON_CDROM_DRIVE;
                     break;
 
                 case DRIVE_RAMDISK:
-                    *piIndex = SHLICON_RAMDRIVE - 1;
+                    *piIndex = SHLICON_RAMDRIVE;
                     break;
 
@@ -238 +238 @@
                 case DRIVE_NO_ROOT_DIR:
                 default:
-                    *piIndex = SHLICON_HARDDISK - 1;
+                    *piIndex = SHLICON_HARDDISK;
                     break;
             }
@@ -244 +244 @@
       }
 
-      if ( ( *piIndex == ( SHLICON_HARDDISK - 1  ) ) &&
+      if ( ( *piIndex == ( SHLICON_HARDDISK ) ) &&
            HCR_GetDefaultIcon( "Drive", sTemp, MAX_PATH, &dwNr ) )
       {
@@ -276 +276 @@
 #ifdef __WIN32OS2__
         *piIndex = (uFlags & GIL_OPENICON)
-                                 ? SHLICON_FOLDER_OPEN - 1 : SHLICON_FOLDER_CLOSED - 1;
+                                 ? SHLICON_FOLDER_OPEN : SHLICON_FOLDER_CLOSED;
 #else
         *piIndex = (uFlags & GIL_OPENICON)? 4 : 3;
@@ -311 +311 @@
                 SHGetPathFromIDListA(This->pidl, sTemp);
                 lstrcpynA(szIconFile, "shell32.dll", cchMax);
-                *piIndex = SHLICON_COMPUTERS - 1;
+                *piIndex = SHLICON_COMPUTERS;
               }
               else if (stricmp(sTemp,"COM") == 0)
@@ -317 +317 @@
                 SHGetPathFromIDListA(This->pidl, sTemp);
                 lstrcpynA(szIconFile, "shell32.dll", cchMax);
-                *piIndex = SHLICON_APPLICATION - 1;
+                *piIndex = SHLICON_APPLICATION;
               }
 #if 0