Changeset 1454

Timestamp:

Sep 13, 2009, 1:27:47 AM (16 years ago)

Author:

Gregg Young

Message:

Add submenu to view ini that includes fm3.ini, the user ini and the system ini as open choices (ticket 366)

Location:

trunk/dll

Files:

• fm3dll2.h (modified) (2 diffs)
• fm3res.rc (modified) (2 diffs)
• inis.c (modified) (3 diffs)
• mainwnd.c (modified) (2 diffs)
• mainwnd2.c (modified) (2 diffs)

trunk/dll/fm3dll2.h

@@ -27 +27 @@
   27 Jun 09 GKY Remove IDM_DRIVEATEXT (3950) Drivebar update
   13 Jul 09 SHL Rename timer ids
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
 
   Align with spaces only - no tabs please
@@ -404 +405 @@
 #define IDM_SYSTEMSUBMENU   2014
 #define IDM_BOOKSELFSUBMENU 2015
+#define IDM_INIVIEWERFM2    2016
+#define IDM_INIVIEWERSUBMENU 2017
+#define IDM_INIVIEWERSYS    2018
 
 #define IDM_CONFIGMENU      3000

trunk/dll/fm3res.rc

@@ -53 +53 @@
                 and rescans drive in tree container depending on container focus, greyed out
                 inappropriate menu context choices
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini              
 
 ***********************************************************************/
@@ -236 +237 @@
          MENUITEM "DataBar",           IDM_DATABAR
          MENUITEM "",                  -1,               MIS_SEPARATOR
-         MENUITEM "~INI viewer",       IDM_INIVIEWER
+         SUBMENU "~INI viewer", IDM_INIVIEWERSUBMENU
+         {
+                MENUITEM "OS/2 ~User INI",    IDM_INIVIEWER
+                MENUITEM "OS/2 ~Sys INI",     IDM_INIVIEWERSYS
+                MENUITEM "~FM2 INI",          IDM_INIVIEWERFM2
+         }
          MENUITEM "~Kill processes",   IDM_KILLPROC
          MENUITEM "I~nstant CMD file", IDM_INSTANT

trunk/dll/inis.c

@@ -35 +35 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   14 Mar 09 GKY Additional strings move to PCSZs
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
 
 ***********************************************************************/
@@ -1512 +1513 @@
   FCF_TITLEBAR | FCF_MINMAX | FCF_MENU | FCF_ACCELTABLE | FCF_NOBYTEALIGN;
 
-HWND StartIniEditor(HWND hwnd, CHAR * fname, INT flags)
+HWND StartIniEditor(HWND hwnd, CHAR *fname, INT flags)
 {
   /*
@@ -2091 +2092 @@
     else {
       if (mp1) {
-        strcpy(inidata->ininame, (CHAR *)mp1);
-        inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
-                                       inidata->ininame);
-        free(mp1);
+        if (!strcmp((CHAR *)mp1, "SYS")) {
+          inidata->hini = HINI_SYSTEMPROFILE;
+          free(mp1);
+        }
+        else
+        {
+          strcpy(inidata->ininame, (CHAR *)mp1);
+          inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
+                                         inidata->ininame);
+          free(mp1);
+        }
       }
       else

trunk/dll/mainwnd.c

@@ -97 +97 @@
                 inappropriate menu context choices
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
 
 ***********************************************************************/
@@ -5345 +5346 @@
     break;
 
+  case IDM_INIVIEWERSYS:
+    StartIniEditor(hwnd, "SYS", 4);
+    break;
+
+  case IDM_INIVIEWERFM2:
+    StartIniEditor(hwnd, profile, 4);
+    break;
+
   case IDM_EDITASSOC:
     EditAssociations(hwnd);

trunk/dll/mainwnd2.c

@@ -32 +32 @@
                 letter windows; Use button ID to identify drive letter for processing.
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
 
 ***********************************************************************/
@@ -436 +437 @@
   case IDM_DOSCOMMANDLINE:
   case IDM_INIVIEWER:
+  case IDM_INIVIEWERFM2:
+  case IDM_INIVIEWERSYS:
   case IDM_EDITASSOC:
   case IDM_COMMANDLINE: