Changeset 4706

Timestamp:

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

Author:

sandervl

Message:

KS: icon index fix

Location:

trunk/src/shell32

Files:

• folders.c (modified) (11 diffs)
• shellicon.h (modified) (1 diff)
• shres.orc (modified) (2 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

trunk/src/shell32/shellicon.h ¶

@@ -2 +2 @@
 #define __SHELLICON_H__
 
-#define SHLICON_FILE            1
-#define SHLICON_TEXTFILE        2
-#define SHLICON_APPLICATION     3
-#define SHLICON_FOLDER_CLOSED   4
-#define SHLICON_FOLDER_OPEN     5
-#define SHLICON_FLOPPY525       6
-#define SHLICON_FLOPPY35        7
-#define SHLICON_REMOVABLE_DISK  8
-#define SHLICON_HARDDISK        9
-#define SHLICON_NETDRIVE_CONN   10
-#define SHLICON_NETDRIVE_DISCON 11
-#define SHLICON_CDROM_DRIVE     12
-#define SHLICON_RAMDRIVE        13
-#define SHLICON_ENTIRENETWORK   14
-#define SHLICON_NETWORK         15
-#define SHLICON_NETWORK_COMP    16
-#define SHLICON_PRINTER         17
-#define SHLICON_NETWORK_PLACE   18
-#define SHLICON_NETWORK_GROUP   19
-#define SHLICON_PROGRAMS        20
-#define SHLICON_RECENTDOCS      21
-#define SHLICON_SETTINGS        22
-#define SHLICON_SEARCH          23
-#define SHLICON_HELP            24
-#define SHLICON_RUN             25
-#define SHLICON_SUSPEND         26
-#define SHLICON_UNDOCK          27
-#define SHLICON_SHUTDOWN        28
-#define SHLICON_SHAREDRES       29
-#define SHLICON_SHORTCUT        30
-#define SHLICON_ARROW           31
-#define SHLICON_TRASHCAN        32
-#define SHLICON_TRASHCAN_FULL   33
-#define SHLICON_DIALUP_FOLDER   34
-#define SHLICON_DESKTOP         35
-#define SHLICON_CONTROLPANEL    36
-#define SHLICON_PROGRAMGROUP    37
-#define SHLICON_PRINTER_FOLDER  38
-#define SHLICON_FONT_FOLDER     39
-#define SHLICON_LOGO            40
-#define SHLICON_AUDIO_CD        41
-#define SHLICON_TREE            42
-#define SHLICON_COMPUTERS       43
-#define SHLICON_FAVORITES       44
-#define SHLICON_LOGOFF          45
+#define SHLICON_FILE                    0
+#define SHLICON_TEXTFILE                1
+#define SHLICON_APPLICATION             2
+#define SHLICON_FOLDER_CLOSED   3
+#define SHLICON_FOLDER_OPEN             4
+#define SHLICON_FLOPPY525               5
+#define SHLICON_FLOPPY35                6
+#define SHLICON_REMOVABLE_DISK  7
+#define SHLICON_HARDDISK                8
+#define SHLICON_NETDRIVE_CONN   9
+#define SHLICON_NETDRIVE_DISCON 10
+#define SHLICON_CDROM_DRIVE             11
+#define SHLICON_RAMDRIVE                12
+#define SHLICON_ENTIRENETWORK   13
+#define SHLICON_NETWORK                 14
+#define SHLICON_NETWORK_COMP    15
+#define SHLICON_PRINTER                 16
+#define SHLICON_NETWORK_PLACE   17
+#define SHLICON_NETWORK_GROUP   18
+#define SHLICON_PROGRAMS                19
+#define SHLICON_RECENTDOCS              20
+#define SHLICON_SETTINGS                21
+#define SHLICON_SEARCH                  22
+#define SHLICON_HELP                    23
+#define SHLICON_RUN                             24
+#define SHLICON_SUSPEND                 25
+#define SHLICON_UNDOCK                  26
+#define SHLICON_SHUTDOWN                27
+#define SHLICON_SHAREDRES               28
+#define SHLICON_SHORTCUT                29
+#define SHLICON_ARROW                   30
+#define SHLICON_TRASHCAN                31
+#define SHLICON_TRASHCAN_FULL   32
+#define SHLICON_DIALUP_FOLDER   33
+#define SHLICON_DESKTOP                 34
+#define SHLICON_CONTROLPANEL    35
+#define SHLICON_PROGRAMGROUP    36
+#define SHLICON_PRINTER_FOLDER  37
+#define SHLICON_FONT_FOLDER     38
+#define SHLICON_LOGO                    39
+#define SHLICON_AUDIO_CD                40
+#define SHLICON_TREE                    41
+#define SHLICON_COMPUTERS               42
+#define SHLICON_FAVORITES               43
+#define SHLICON_LOGOFF                  44
 
 //is actually present in explorer.exe..

trunk/src/shell32/shres.orc ¶

@@ -1 @@
-/* $Id: shres.orc,v 1.9 2000-11-27 10:22:00 sandervl Exp $ */
+/* $Id: shres.orc,v 1.10 2000-11-28 11:00:47 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -191 +191 @@
 SHLICON_APPLICATION   ICON LOADONCALL DISCARDABLE "ico/application.ico"
 SHLICON_FOLDER_CLOSED   ICON LOADONCALL DISCARDABLE "ico/folder-c.ico"
-SHLICON_FOLDER_OPENED   ICON LOADONCALL DISCARDABLE "ico/folder-o.ico"
+SHLICON_FOLDER_OPEN   ICON LOADONCALL DISCARDABLE "ico/folder-o.ico"
 SHLICON_FLOPPY525   ICON LOADONCALL DISCARDABLE "ico/floppy5.ico"
 SHLICON_FLOPPY35   ICON LOADONCALL DISCARDABLE "ico/floppy3.ico"