Changeset 210

Timestamp:

Aug 22, 2002, 10:43:34 AM (23 years ago)

Author:

umoeller

Message:

Fixed build breaks.

Location:

trunk

Files:

• include/helpers/winh.h (modified) (1 diff)
• src/helpers/dialog.c (modified) (2 diffs)
• src/helpers/except.c (modified) (1 diff)
• src/helpers/winh.c (modified) (1 diff)
• xdoc.exe (modified) ( previous)

trunk/include/helpers/winh.h

@@ -255 +255 @@
 
     #define winhRemoveMenuItem(hwndMenu, sItemID) \
-            (SHORT)WinSendMsg(hwndMenu, MM_REMOVEITEM, MPFROM2SHORT(sItemID, FALSE), 0)
+            SHORT1FROMMR(WinSendMsg(hwndMenu, MM_REMOVEITEM, MPFROM2SHORT(sItemID, FALSE), 0))
 
     BOOL XWPENTRY winhRemoveMenuItems(HWND hwndMenu,

trunk/src/helpers/dialog.c

@@ -5 +5 @@
  *      auto-format dialogs from control arrays in memory.
  *
- *      See dlghCreateDlg for details.
+ *      As a summary, this code allows you to get rid of
+ *      PM dialog resources completely.
+ *
+ *      See dlghCreateDlg for an introduction.
  *
  *      See @dlg_algorithm for the gory details of the new
@@ -2742 +2745 @@
                                          pCurrentRow,
                                          FALSE,        // no nested table
-                                         (PVOID)pItemThis->ul1, // pCtlDef, V0.9.21 (2002-08-18) [umoeller]
+                                         (const CONTROLDEF *)pItemThis->ul1, // pCtlDef, V0.9.21 (2002-08-18) [umoeller]
                                          &pColumn)))
                     lstAppendItem(&pCurrentRow->llColumns,

trunk/src/helpers/except.c

@@ -549 +549 @@
             fprintf(file, "\nXCPT_ACCESS_VIOLATION: ");
             if (pReportRec->ExceptionInfo[0] & XCPT_READ_ACCESS)
-                fprintf(file, "Invalid read access from 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
+                fprintf(file, "XCPT_READ_ACCESS -- Invalid read access from 0x%04lX:%08lX.\n",
+                        pContextRec->ctx_SegDs,
+                        pReportRec->ExceptionInfo[1]);
             else if (pReportRec->ExceptionInfo[0] & XCPT_WRITE_ACCESS)
-                fprintf(file, "Invalid write access to 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
+                fprintf(file, "XCPT_WRITE_ACCESS -- Invalid write access to 0x%04lX:%08lX.\n",
+                        pContextRec->ctx_SegDs,
+                        pReportRec->ExceptionInfo[1]);
             else if (pReportRec->ExceptionInfo[0] & XCPT_SPACE_ACCESS)
-                fprintf(file, "Invalid space access at 0x%04lX.\n",
+                fprintf(file, "XCPT_SPACE_ACCESS -- Invalid space access at 0x%04lX.\n",
                         pReportRec->ExceptionInfo[1]);
             else if (pReportRec->ExceptionInfo[0] & XCPT_LIMIT_ACCESS)
-                fprintf(file, "Invalid limit access occurred.\n");
+                fprintf(file, "XCPT_LIMIT_ACCESS -- Invalid limit access occurred.\n");
             else if (pReportRec->ExceptionInfo[0] == XCPT_UNKNOWN_ACCESS)
-                fprintf(file, "unknown at 0x%04lX:%08lX\n",
-                            pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
+                fprintf(file, "XCPT_UNKNOWN_ACCESS -- unknown at 0x%04lX:%08lX\n",
+                        pContextRec->ctx_SegDs,
+                        pReportRec->ExceptionInfo[1]);
             fprintf(file,
                     "Explanation: An attempt was made to access a memory object which does\n"

trunk/src/helpers/winh.c

@@ -593 +593 @@
          ++ul)
     {
+        SHORT s = asItemIDs[ul];
         winhRemoveMenuItem(hwndMenu,
-                           asItemIDs[ul]);
+                           s);
     }