Changeset 1398 for trunk/dll/treecnr.c

Timestamp:

Feb 21, 2009, 6:43:00 PM (16 years ago)

Author:

Gregg Young

Message:

Move embeded strings to PCSZ variables or string table; Eliminate Error2 functions Runtime_Error with NULL format string returns "No data" error. Change declares from PSZ to PCSZ in functions where the variable isn't changed. Added btm as an executable file type in several additional places. Use fProtectOnly to prevent attempt to execute Dos and Win programs on "Protect only" installs in several additional places.

File:

• trunk/dll/treecnr.c (modified) (12 diffs)

trunk/dll/treecnr.c

@@ -671 +671 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       BOOL tempsusp = dcd->suspendview;
@@ -686 +686 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd || !mp1)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       INT numentries = 0;
@@ -704 +704 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
 #     ifdef FORTIFY
@@ -718 +718 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     // Bypass if not running integrated (i.e if vtree)
     else if (hwndStatus &&
@@ -806 +806 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
@@ -861 +861 @@
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!dcd)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WORKER *wk;
@@ -905 +905 @@
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!dcd)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WORKER *wk;
@@ -1257 +1257 @@
 
     if (!dcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
       return 0;
@@ -1363 +1363 @@
                                   MPFROMLONG(CMA_FIRST), MPFROMP(&pqr));
       if (!pci || (INT) pci == -1)
-        break; //Probable B3 click on white space Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        break; //Probable B3 click on white space
       else {
         memset(&nr, 0, sizeof(nr));
@@ -1530 +1530 @@
 
           if (!pcd) {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
             break;
           }
@@ -1536 +1536 @@
             pci = (PCNRITEM) pcd->pRecord;
             if (!pci || (INT) pci == -1) {
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
               break;
             }
@@ -2301 +2301 @@
   case UM_COMMAND:
     if (!mp1)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       if (!dcd) {
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
         FreeListInfo((LISTINFO *) mp1);
       }