Changeset 1450

Timestamp:

Jul 28, 2009, 12:23:55 AM (16 years ago)

Author:

Gregg Young

Message:

Add a PCSZ srting for error messages; prevent error popup for locked text file on directory scan (scan works as expected anyway); Pass file names on stack which is in low mem for DosGetMessage.

Location:

trunk/dll

Files:

• errutil.c (modified) (3 diffs)
• filldir.c (modified) (1 diff)
• init.c (modified) (2 diffs)
• init.h (modified) (1 diff)
• systemf.c (modified) (1 diff)

trunk/dll/errutil.c

@@ -119 +119 @@
 {
   CHAR szMsg[4096];
-  CHAR *szMsgFile, *szMsgFileH;
+  CHAR szMsgFile[20], szMsgFileH[20];
   ULONG Class;                          // Error class
   ULONG action;                         // Error action
@@ -131 +131 @@
     return MBID_ENTER;                  // Should not have been called
 
-  //Allocate low memory for DosGetMessage (16 bit)
-  DosAllocMem((PVOID) &szMsgFile, CCHMAXPATH,
-               PAG_COMMIT | PAG_READ | PAG_WRITE);
-  DosAllocMem((PVOID) &szMsgFileH, CCHMAXPATH,
-               PAG_COMMIT | PAG_READ | PAG_WRITE);
   // Format caller's message
   va_start(va, pszFmt);
@@ -169 +164 @@
       || !DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC,
                         szMsgFileH, &ulMsgLen)) {
-    DosFreeMem(szMsgFile);
-    DosFreeMem(szMsgFileH);
     // Got message
     pszMsgStart[ulMsgLen + 1] = 0;      // Terminate

trunk/dll/filldir.c

@@ -460 +460 @@
         eaop.oError = 0;
         rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
-                              (PVOID) &eaop, (ULONG) sizeof(EAOP2));
-        if (rc) {
+                              (PVOID) &eaop, (ULONG) sizeof(EAOP2));
+        // Prevent this error from occuring when scanning a directory
+        // that contains a locked data file
+        if (rc && rc != ERROR_SHARING_VIOLATION) {
           CHAR s[80];
           sprintf(s, "%s %s",PCSZ_DOSQUERYPATHINFO, "%s");

trunk/dll/init.c

@@ -271 +271 @@
 PCSZ PCSZ_CM_ALLOCRECORD  = "CM_ALLOCRECORD";
 PCSZ PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
+PCSZ PCSZ_DOSCREATEEVENTSEM =  "DosCreateEventSem";
 PCSZ PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
 PCSZ PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
@@ -1098 +1099 @@
   if (DosCreateEventSem(NULL, &hevInitialCnrScanComplete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEEVENTSEM);
 
   /*

trunk/dll/init.h

@@ -95 +95 @@
 extern PCSZ PCSZ_CM_ALLOCRECORD;
 extern PCSZ PCSZ_DOSCREATEMUTEXSEM;
+extern PCSZ PCSZ_DOSCREATEEVENTSEM;
 extern PCSZ PCSZ_DOSDUPHANDLE;
 extern PCSZ PCSZ_DOSGETINFOBLOCKS;

trunk/dll/systemf.c

@@ -1097 +1097 @@
                 hTermQ = (HQUEUE)0;     // Try to survive
                 DosExitCritSec();
-                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DoCreateEventSem");
+                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__, PCSZ_DOSCREATEEVENTSEM);
             }
             // if (!rc) fprintf(stderr,"%s %d qcreated ptib %x hTermQ %x\n",__FILE__, __LINE__,ptib,hTermQ);