Changeset 912 for trunk/dll/inis.c

Timestamp:

Jan 9, 2008, 7:27:26 PM (18 years ago)

Author:

Steven Levine

Message:

Avoid closing INI more times than opened
Add some missing error reporting
Standardize PrfOpenProfile return checks

File:

• trunk/dll/inis.c (modified) (14 diffs)

trunk/dll/inis.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2007 Steven H. Levine
+  Copyright (c) 2004, 2008 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -21 +21 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   16 Nov 07 SHL Ensure fixup buffer sufficiently large
+  09 Jan 08 SHL Avoid closing INI more times than opened
+  09 Jan 08 SHL Add some missing error reporting
+  09 Jan 08 SHL Standardize PrfOpenProfile return checks
 
 ***********************************************************************/
@@ -95 +98 @@
   HAB hab2;
   HMQ hmq2;
-  HINI hini1 = (HINI) 0, hini2 = (HINI) 0;
+  HINI hini1 = NULLHANDLE;
+  HINI hini2 = NULLHANDLE;
   PRFPROFILE cprfp;
   CHAR userini[CCHMAXPATH], sysini[CCHMAXPATH];
@@ -122 +126 @@
             hini2 = HINI_SYSTEMPROFILE;
         }
-        if (!hini1)
+        if (hini1 == NULLHANDLE) {
           hini1 = PrfOpenProfile(hab2, inirec->filename1);
-        if (!hini2) {
+          if (hini1 == NULLHANDLE) {
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "PrfOpenProfile failed for %s", inirec->filename1);
+          }
+        }
+        if (hini2 == NULLHANDLE) {
           if (!stricmp(inirec->filename1, inirec->filename2))
             hini2 = hini1;
-          else
+          else {
             hini2 = PrfOpenProfile(hab2, inirec->filename2);
+            if (hini2 == NULLHANDLE) {
+              Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                        "PrfOpenProfile failed for %s", inirec->filename2);
+            }
+          }
         }
         if (hini1 && hini2 && (*inirec->app2 || hini1 != hini2)) {
@@ -243 +257 @@
         if (hini1)
           PrfCloseProfile(hini1);
-        if (hini2)
+        if (hini2 && hini2 != hini1)
           PrfCloseProfile(hini2);
         WinDestroyMsgQueue(hmq2);
@@ -290 +304 @@
   HAB hab2;
   HMQ hmq2;
-  HINI orig = (HINI) 0, new;
+  HINI orig = NULLHANDLE;
+  HINI new;
   PVOID pDataA, pDataK, pData;
   PBYTE pCurrentA, pCurrentK;
@@ -316 +331 @@
             orig = HINI_SYSTEMPROFILE;
         }
-        if (!orig)
+        if (orig == NULLHANDLE)
           orig = PrfOpenProfile(hab2, prfp->pszUserName);
-        if (orig) {
+        if (orig == NULLHANDLE) {
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    "PrfOpenProfile failed for %s", prfp->pszUserName);
+        }
+        else {
           new = PrfOpenProfile(hab2, prfp->pszSysName);
-          if (new) {
+          if (new == NULLHANDLE) {
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "PrfOpenProfile failed for %s", prfp->pszSysName);
+          }
+          else {
             if (PrfQueryProfileSize(orig, NULL, NULL, (PULONG) & ulSize)
                 && ulSize) {
@@ -921 +944 @@
         WinQueryDlgItemText(hwnd, INIR_SYSTEMPROFILE, CCHMAXPATH, sysini);
         testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
-        if (!testini) {
+        if (testini == NULLHANDLE) {
           saymsg(MB_CANCEL,
                  hwnd,
@@ -930 +953 @@
         PrfCloseProfile(testini);
         testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
-        if (!testini) {
+        if (testini == NULLHANDLE) {
           saymsg(MB_CANCEL,
                  hwnd,
@@ -1054 +1077 @@
         MakeFullName(sysini);
         testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
-        if (!testini) {
+        if (testini == NULLHANDLE) {
           saymsg(MB_CANCEL,
                  hwnd,
@@ -1063 +1086 @@
         PrfCloseProfile(testini);
         testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
-        if (!testini) {
+        if (testini == NULLHANDLE) {
           saymsg(MB_CANCEL,
                  hwnd,
@@ -1430 +1453 @@
       return (HWND) 0;
     hINI = PrfOpenProfile(useHab, filename);
-    if (!hINI) {
+    if (hINI == NULLHANDLE) {
       free(filename);
       return (HWND) 0;
@@ -1979 +2002 @@
       else
         inidata->hini = HINI_USERPROFILE;
-      if (!inidata->hini) {
+      if (inidata->hini == NULLHANDLE) {
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "PrfOpenProfile failed for %s", inidata->ininame);
         PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
         break;
@@ -2515 +2540 @@
             !DosQueryPathInfo(filename, FIL_STANDARD, &fsa, sizeof(fsa))) {
           hINI = PrfOpenProfile(WinQueryAnchorBlock(hwnd), filename);
-          if (!hINI) {
+          if (hINI == NULLHANDLE) {
             Win_Error(hwnd, hwnd, __FILE__, __LINE__,
                       GetPString(IDS_INICANTOPENINITEXT), filename);