Changeset 48

Timestamp:

02/10/08 09:55:25 (10 months ago)

Author:

cinc

Message:

Some code cleanup when using setup strings for propagating settings.

Files:

• trunk/Menufolder/c/wpswizzsettings.cpp (modified) (9 diffs)

trunk/Menufolder/c/wpswizzsettings.cpp

@@ -455 +455 @@
         PAGEINFO pageInfo;
         HINI hini;
-        HOBJECT  hObject;
         ULONG  attrFound;
         ULONG  len;
-    CWWizzSettings* thisPtr;
-        
-
+    CWWizzSettings* thisPtr;    
         
         switch(msg) {
@@ -503 +500 @@
         {
           char chrPath[CCHMAXPATH];
-
+          HOBJECT  hObject;
+
+          /* There is always a config.sys file on the boot drive */
           DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &attrFound, sizeof(attrFound));
           sprintf(chrPath,"%c:\\config.sys", 'A'+attrFound-1);
+          hObject=WinQueryObject(chrPath);
 
           switch(SHORT1FROMMP(mp1)) {
@@ -511 +511 @@
             if(g_fInfoWindowEnabled){
               g_fInfoWindowEnabled=FALSE;
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject, SETUP_ENABLEINFOWINDOW"=0");/* This is catched in wpSetup() of CWObject */
               }
@@ -517 +517 @@
             }// end if
             else {
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject, SETUP_ENABLEINFOWINDOW"=1");/* This is catched in wpSetup() of CWObject */
               }
@@ -527 +527 @@
             if(g_fHintsEnabled){
               g_fHintsEnabled=FALSE;
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject,SETUP_ENABLEHINTS"=0");/* This is catched in wpSetup() of CWObject */
               }
@@ -533 +533 @@
             }// end if
             else {
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject,SETUP_ENABLEHINTS"=1");/* This is catched in wpSetup() of CWObject */
               }
@@ -543 +543 @@
             if(g_fRexxScriptsEnabled){
               g_fRexxScriptsEnabled=FALSE;
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject,SETUP_ENABLESCRIPTS"=0");/* This is catched in wpSetup() of CWObject */
               }
@@ -551 +551 @@
             }// end if
             else {
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
+              if(hObject!=NULLHANDLE) {
                 WinSetObjectData(hObject,SETUP_ENABLESCRIPTS"=1");/* This is catched in wpSetup() of CWObject */
               }
@@ -558 +558 @@
               WinEnableWindow(WinWindowFromID(hwnd, ID_ENABLEHINTS), TRUE);
               WinEnableWindow(WinWindowFromID(hwnd, IDCB_FLDRINFOWINDOW), TRUE);
-            }
-          
+            }          
             break;
           case FODLG_SHOWSIZE:
             if(g_fFileSizeEnabled){
               g_fFileSizeEnabled=FALSE;
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
-                WinSetObjectData(hObject,"ENABLESIZEITEM=0");
+              if(hObject!=NULLHANDLE) {
+                WinSetObjectData(hObject, SETUP_ENABLESIZEITEM"=0");
               }
               ulOptions&=~FILESIZEENABLED;
             }// end if
             else {
-              if((hObject=WinQueryObject(chrPath))!=NULLHANDLE) {
-                WinSetObjectData(hObject,"ENABLESIZEITEM=1");
+              if(hObject!=NULLHANDLE) {
+                WinSetObjectData(hObject, SETUP_ENABLESIZEITEM"=1");
               }
               g_fFileSizeEnabled=TRUE;
               ulOptions|=FILESIZEENABLED;
             }
-            /*                          WinSendMsg(WinWindowFromID(hwnd, FODLG_SHOWSIZE),
-                            BM_SETCHECK,MPFROMSHORT(bFileSizeEnabled),(MPARAM)NULL);*/
             break;
           case ID_NOFORMATMENUE:
-            if(bNoFormatMenue){
-              if((hObject=WinQueryObject("<WP_DRIVE_C>"))!=NULLHANDLE) {
-                WinSetObjectData(hObject,"DISABLEFORMATMENU=0");
-              }
-              bNoFormatMenue=FALSE;
-              ulOptions&=~NOFORMATMENUE;
-            }// end if
-            else{
-              if((hObject=WinQueryObject("<WP_DRIVE_C>"))!=NULLHANDLE) {
-                WinSetObjectData(hObject,"DISABLEFORMATMENU=1");
-              }
-              bNoFormatMenue=TRUE;
-              ulOptions|=NOFORMATMENUE;
+            {
+              DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &attrFound, sizeof(attrFound));
+              sprintf(chrPath,"<WP_DRIVE_%c>", 'A'+attrFound-1);
+              hObject=WinQueryObject(chrPath);
+
+              if(bNoFormatMenue){
+                if(hObject!=NULLHANDLE) {
+                  WinSetObjectData(hObject, SETUP_DISABLEFORMATMENU"=0");
+                }
+                bNoFormatMenue=FALSE;
+                ulOptions&=~NOFORMATMENUE;
+              }// end if
+              else{
+                if(hObject!=NULLHANDLE) {
+                  WinSetObjectData(hObject, SETUP_DISABLEFORMATMENU"=1");
+                }
+                bNoFormatMenue=TRUE;
+                ulOptions|=NOFORMATMENUE;
+              }
+              break;
             }
-            break;
           case ID_CONTEXTMENUE:
             if(bGlobalMenuEnabled){