Changeset 705 for trunk/dll

Timestamp:

Jun 24, 2007, 9:17:37 PM (18 years ago)

Author:

Gregg Young

Message:

Minor code cleanup fix ramdisk on states list & WORPLACE_PROCESS logic

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• collect.c (modified) (1 diff)
• dircnrs.c (modified) (1 diff)
• filldir.c (modified) (2 diffs)
• init.c (modified) (2 diffs)
• treecnr.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -3216 +3216 @@
     break;
   }
-  return dcd && dcd->oldproc ? dcd->oldproc(hwnd, msg, mp1, mp2) :
-                               PFNWPCnr(hwnd, msg, mp1, mp2);
+  if (dcd && dcd->oldproc){
+      return dcd->oldproc(hwnd, msg, mp1, mp2);
+  }
+  else
+      return PFNWPCnr(hwnd, msg, mp1, mp2);
 }
 

trunk/dll/collect.c

@@ -2623 +2623 @@
     break;
   }
-  return (dcd && dcd->oldproc) ? dcd->oldproc(hwnd, msg, mp1, mp2) :
-    PFNWPCnr(hwnd, msg, mp1, mp2);
+  if (dcd && dcd->oldproc){
+      return dcd->oldproc(hwnd, msg, mp1, mp2);
+  }
+  else
+      return PFNWPCnr(hwnd, msg, mp1, mp2);
 }
 

trunk/dll/dircnrs.c

@@ -3328 +3328 @@
     break;
   }
-  return (dcd && dcd->oldproc) ? dcd->oldproc(hwnd, msg, mp1, mp2) :
-    PFNWPCnr(hwnd, msg, mp1, mp2);
+  if (dcd && dcd->oldproc){
+      return dcd->oldproc(hwnd, msg, mp1, mp2);
+  }
+  else
+      return PFNWPCnr(hwnd, msg, mp1, mp2);
 }
 

trunk/dll/filldir.c

@@ -30 +30 @@
   09 Mar 07 GKY Use SelectDriveIcon
   20 Mar 07 GKY Increase extention check to 4 letters for icon selections
+  23 Jun 07 GKY Fixed ram disk without a directory not appearing on states drive list
 
 ***********************************************************************/
@@ -1291 +1292 @@
                                           [toupper(*pci->szFileName) -
                                            'A'] & DRIVE_REMOVABLE))) {
-            if (!Stubby(hwndCnr, pci)) {
+            if (!Stubby(hwndCnr, pci) && !DRIVE_RAMDISK) {
               WinSendMsg(hwndCnr,
                          CM_INVALIDATERECORD,

trunk/dll/init.c

@@ -24 +24 @@
   21 Apr 07 GKY Find FM2Utils by path or utils directory eleminate fAddUtils global
   15 Jun 07 SHL Make OpenWatcom compatible
+  23 Jun 07 GKY Fix WORPLACE_PROCESS enviroment check logic
 
 ***********************************************************************/
@@ -628 +629 @@
 
   /* are we the workplace shell? */
-  env = getenv("WORKPLACE__PROCESS");
-  if (!env || stricmp(env, "NO"))
+  env = getenv("WORKPLACE_PROCESS");
+  if (!env || stricmp(env, "YES"))
     fWorkPlace = TRUE;
 

trunk/dll/treecnr.c

@@ -2889 +2889 @@
     break;
   }
-  return (dcd && dcd->oldproc) ? dcd->oldproc(hwnd, msg, mp1, mp2) :
-    PFNWPCnr(hwnd, msg, mp1, mp2);
+  if (dcd && dcd->oldproc){
+      return dcd->oldproc(hwnd, msg, mp1, mp2);
+  }
+  else
+      return PFNWPCnr(hwnd, msg, mp1, mp2);
 }
 
@@ -3017 +3020 @@
                            GetPString(IDS_TREETEXT));
         }
-        dcd->oldproc = WinSubclassWindow(dcd->hwndCnr, TreeCnrWndProc);
+        dcd->oldproc = WinSubclassWindow(dcd->hwndCnr, TreeCnrWndProc);
+        printf("%s %d oldproc subclass %X\n ",
+         __FILE__, __LINE__, dcd->oldproc); fflush(stdout);
+        if (dcd->oldproc == 0l)
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                     "WinSubclassWindow");
         if (!PostMsg(dcd->hwndCnr, UM_SETUP, MPVOID, MPVOID))
           WinSendMsg(dcd->hwndCnr, UM_SETUP, MPVOID, MPVOID);