Changeset 730 for trunk/dll/misc.c

Timestamp:

Jul 22, 2007, 7:57:09 PM (18 years ago)

Author:

Gregg Young

Message:

Preliminary work on variable sized container buffers. Removes szFileName etc. Builds fine but traps.

File:

• trunk/dll/misc.c (modified) (8 diffs)

trunk/dll/misc.c

@@ -24 +24 @@
   18 Feb 07 GKY More drive type and drive icon support
   10 Jun 07 GKY Add IsFm2Window as part of work around PM drag limit
+  05 Jul 07 GKY Fix menu removals for WORKPLACE_PROCESS=YES
 
 ***********************************************************************/
@@ -651 +652 @@
       if (pci &&
           (INT) pci != -1 &&
-          !IsRoot(pci->szFileName) &&
+          !IsRoot(pci->pszFileName) &&
           !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
         if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName)) {
-          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->szFileName), MPVOID);
+          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
         }
         else if (pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject))
@@ -673 +674 @@
       HWND hwndMLE = WinWindowFromID(hwnd, CID_MLE);
 
-      if (pci && (INT) pci != -1 && !IsRoot(pci->szFileName)) {
+      if (pci && (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
         if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject)) {
 
@@ -720 +721 @@
             eaop.fpFEA2List = pfealist;
             eaop.oError = 0L;
-            rc = DosSetPathInfo(pci->szFileName,
+            rc = DosSetPathInfo(pci->pszFileName,
                                 FIL_QUERYEASIZE,
                                 (PVOID) & eaop, sizeof(EAOP2), DSPI_WRTTHRU);
@@ -738 +739 @@
           chop_at_crnl(longname);
           WinSetWindowText(hwndMLE, longname);
-          return (MRESULT) WriteLongName(pci->szFileName, longname);
+          return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
         else {
           WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
-              strchr(szData, '*') || IsRoot(pci->szFileName))
+              strchr(szData, '*') || IsRoot(pci->pszFileName))
             return (MRESULT) FALSE;
           /* If the text changed, rename the file system object. */
@@ -755 +756 @@
                                  testname, sizeof(testname)))
               return FALSE;
-            if (DosQueryPathInfo(pci->szFileName,
+            if (DosQueryPathInfo(pci->pszFileName,
                                  FIL_QUERYFULLNAME, szData, sizeof(szData)))
-              strcpy(szData, pci->szFileName);
+              strcpy(szData, pci->pszFileName);
             WinSetWindowText(hwndMLE, szData);
             if (strcmp(szData, testname)) {
@@ -775 +776 @@
                     free(filename);
                 }
-                if (stricmp(testname, pci->szFileName)) {
+                if (stricmp(testname, pci->pszFileName)) {
                   PostMsg(hwnd, UM_FIXEDITNAME, MPFROMLONG(-1), MPFROMP(pci));
-                  filename = xstrdup(pci->szFileName, pszSrcFile, __LINE__);
+                  filename = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
                   if (filename) {
                     if (!PostMsg(hwnd,
@@ -797 +798 @@
       PCNRITEM pci = (PCNRITEM) ((PCNREDITDATA) mp2)->pRecord;
 
-      if (pci && (INT) pci != -1 && !IsRoot(pci->szFileName)) {
+      if (pci && (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
         WinSendMsg(hwnd,
                    CM_INVALIDATERECORD,