Changeset 747 for trunk/dll/misc.c

Timestamp:

Jul 31, 2007, 2:53:43 AM (18 years ago)

Author:

Gregg Young

Message:

Updates to direct editting code Subject and longnme appear to work fine. The filename doesn't include the path so the edit fails

File:

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

trunk/dll/misc.c

@@ -679 +679 @@
           EAOP2 eaop;
           PFEA2LIST pfealist = NULL;
-          CHAR szSubject[256];
+          CHAR szSubject[2048];
           ULONG ealen;
           USHORT len;
-          CHAR *eaval;
-
-          WinQueryWindowText(hwndMLE, 40, szSubject);
-          szSubject[39] = 0;
+          CHAR *eaval;
+          LONG retlen;
+
+          retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
+          szSubject[retlen + 1] = 0;
           chop_at_crnl(szSubject);
           bstrip(szSubject);
@@ -694 +695 @@
           else
             ealen = sizeof(FEALIST) + 9;
-          rc = DosAllocMem((PPVOID) & pfealist, ealen + 64L,
+          rc = DosAllocMem((PPVOID) & pfealist, ealen + 64,
                            OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
           if (rc)
@@ -702 +703 @@
             memset(pfealist, 0, ealen + 1);
             pfealist->cbList = ealen;
-            pfealist->list[0].oNextEntryOffset = 0L;
+            pfealist->list[0].oNextEntryOffset = 0;
             pfealist->list[0].fEA = 0;
             pfealist->list[0].cbName = 8;
@@ -732 +733 @@
 
           CHAR longname[CCHMAXPATHCOMP];
+        LONG retlen;
 
           *longname = 0;
-          WinQueryWindowText(hwndMLE, sizeof(longname), longname);
-          longname[CCHMAXPATHCOMP - 1] = 0;
+          retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
+          longname[retlen + 1] = 0;
           chop_at_crnl(longname);
-          WinSetWindowText(hwndMLE, longname);
+          WinSetWindowText(hwndMLE, longname);
+          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(longname), pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
-        else {
-          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
+        else {
+          pci->pszFileName = pci->pszDisplayName;
+          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
+          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
           if (strchr(szData, '?') ||
               strchr(szData, '*') || IsRoot(pci->pszFileName))
             return (MRESULT) FALSE;
-          /* If the text changed, rename the file system object. */
+          /* If the text changed, rename the file system object. */
           chop_at_crnl(szData);
-          bstrip(szData);
+          bstrip(szData);
           if (!IsFullName(szData))
             Runtime_Error(pszSrcFile, __LINE__, "bad name");
@@ -754 +759 @@
                                  FIL_QUERYFULLNAME,
                                  testname, sizeof(testname)))
-              return FALSE;
+                return FALSE;
             if (DosQueryPathInfo(pci->pszFileName,
                                  FIL_QUERYFULLNAME, szData, sizeof(szData)))
@@ -1381 +1386 @@
           QMSG qmsg;
           for (;;) {
-            DosSleep(1L);
+            DosSleep(1);
             rc = WinPostMsg(h, msg, mp1, mp2);
             if (rc)