Changeset 153 for trunk/include/helpers

Timestamp:

Apr 14, 2002, 1:42:05 AM (23 years ago)

Author:

umoeller

Message:

Lots of changes from the last three weeks.

Location:

trunk/include/helpers

Files:

• apps.h (modified) (2 diffs)
• cnrh.h (modified) (1 diff)
• dialog.h (modified) (3 diffs)
• dosh.h (modified) (2 diffs)
• prfh.h (modified) (2 diffs)
• stringh.h (modified) (1 diff)
• wphandle.h (modified) (2 diffs)
• xml.h (modified) (1 diff)
• xstring.h (modified) (1 diff)

trunk/include/helpers/apps.h

@@ -94 +94 @@
      ********************************************************************/
 
-
-        PSZ appQueryDefaultWin31Environment(VOID);
+        APIRET appQueryDefaultWin31Environment(PSZ *ppsz);
 
         #define APP_RUN_FULLSCREEN      0x0001
@@ -102 +101 @@
         #define APP_RUN_SEPARATE        0x0008
 
-        #ifdef XSTRING_HEADER_INCLUDED
-        APIRET appFixProgDetails(PPROGDETAILS pDetails,
-                                 const PROGDETAILS *pcProgDetails,
-                                 ULONG ulFlags,
-                                 PXSTRING pstrExecutablePatched,
-                                 PXSTRING pstrParamsPatched,
-                                 PSZ *ppszWinOS2Env);
-        #endif
+        APIRET appBuildProgDetails(PPROGDETAILS *ppDetails,
+                                   const PROGDETAILS *pcProgDetails,
+                                   ULONG ulFlags);
 
         APIRET XWPENTRY appStartApp(HWND hwndNotify,

trunk/include/helpers/cnrh.h

@@ -616 +616 @@
     HWND cnrhQueryCnrFromFrame(HWND hwndFrame);
 
+    BOOL cnrhOpenEdit(HWND hwndCnr);
+
     PDRAGINFO cnrhInitDrag(HWND hwndCnr,
                            PRECORDCORE preccDrag,

trunk/include/helpers/dialog.h

@@ -42 +42 @@
      ********************************************************************/
 
-    #define DLGERR_FIRST                        10000
-    #define DLGERR_ROW_BEFORE_TABLE             (DLGERR_FIRST)
-    #define DLGERR_CONTROL_BEFORE_ROW           (DLGERR_FIRST + 1)
-    #define DLGERR_NULL_CTL_DEF                 (DLGERR_FIRST + 2)
-    #define DLGERR_CANNOT_CREATE_FRAME          (DLGERR_FIRST + 3)
-    #define DLGERR_INVALID_CODE                 (DLGERR_FIRST + 4)
-    #define DLGERR_TABLE_NOT_CLOSED             (DLGERR_FIRST + 5)
-    #define DLGERR_TOO_MANY_TABLES_CLOSED       (DLGERR_FIRST + 6)
-    #define DLGERR_CANNOT_CREATE_CONTROL        (DLGERR_FIRST + 7)
-    #define DLGERR_ARRAY_TOO_SMALL              (DLGERR_FIRST + 8)
-    #define DLGERR_INVALID_CONTROL_TITLE        (DLGERR_FIRST + 9)
-    #define DLGERR_INVALID_STATIC_BITMAP        (DLGERR_FIRST + 10)
+    #define ERROR_DLG_FIRST                     43000
+
+    #define DLGERR_ROW_BEFORE_TABLE             (ERROR_DLG_FIRST)
+    #define DLGERR_CONTROL_BEFORE_ROW           (ERROR_DLG_FIRST + 1)
+    #define DLGERR_NULL_CTL_DEF                 (ERROR_DLG_FIRST + 2)
+    #define DLGERR_CANNOT_CREATE_FRAME          (ERROR_DLG_FIRST + 3)
+    #define DLGERR_INVALID_CODE                 (ERROR_DLG_FIRST + 4)
+    #define DLGERR_TABLE_NOT_CLOSED             (ERROR_DLG_FIRST + 5)
+    #define DLGERR_TOO_MANY_TABLES_CLOSED       (ERROR_DLG_FIRST + 6)
+    #define DLGERR_CANNOT_CREATE_CONTROL        (ERROR_DLG_FIRST + 7)
+    #define DLGERR_ARRAY_TOO_SMALL              (ERROR_DLG_FIRST + 8)
+    #define DLGERR_INVALID_CONTROL_TITLE        (ERROR_DLG_FIRST + 9)
+    #define DLGERR_INVALID_STATIC_BITMAP        (ERROR_DLG_FIRST + 10)
+
+    #define ERROR_DLG_LAST                      (ERROR_DLG_FIRST + 10)
 
     /* ******************************************************************
@@ -117 +120 @@
                 // type in _DLGHITEM (to specify a group table)
                 // and they are not SZL_AUTOSIZE, they specify the
-                // table size (to override the automatic formatting).
+                // size of the inner table of the group (to override
+                // the automatic formatting). Note that the dialog
+                // formatter adds COMMON_SPACING to both the left and
+                // the right of the table to center the table in the
+                // PM group control, so the actual group size will
+                // be the specified size + (2 * COMMON_SPACING).
 
         ULONG       ulSpacing;          // spacing around control
@@ -195 +203 @@
      ********************************************************************/
 
-    #define COMMON_SPACING          3
+    #define COMMON_SPACING              3
+
+    #define PM_GROUP_SPACING_X          16
+    #define PM_GROUP_SPACING_TOP        16
 
     #define CONTROLDEF_GROUP(pcsz, id, cx, cy) { WC_STATIC, pcsz, \

trunk/include/helpers/dosh.h

@@ -541 +541 @@
                            ULONG ulAttr);
 
-    /* APIRET doshOpenExisting(PCSZ pcszFilename,
-                            ULONG ulOpenFlags,
-                            HFILE *phf);
-       */
+    /* ******************************************************************
+     *
+     *   XFILEs
+     *
+     ********************************************************************/
 
     /*
@@ -555 +556 @@
     {
         HFILE       hf;
-        // ULONG       hmtx;       // a HMTX really
 
         PSZ         pszFilename;    // as given to doshOpen

trunk/include/helpers/prfh.h

@@ -41 +41 @@
      ********************************************************************/
 
-    #define PRFERR_DATASIZE     10001   // couldn't query data size for key
-    #define PRFERR_READ         10003   // couldn't read data from source (PrfQueryProfileData error)
-    #define PRFERR_WRITE        10004   // couldn't write data to target (PrfWriteProfileData error)
-    #define PRFERR_APPSLIST     10005   // couldn't query apps list
-    #define PRFERR_KEYSLIST     10006   // couldn't query keys list
-    #define PRFERR_ABORTED      10007   // aborted by user
-    #define PRFERR_QUERY        10007   // PrfQueryProfile failed
-    #define PRFERR_INVALID_FILE_NAME  10008   // profile names don't contain .INI
-    #define PRFERR_INVALID_KEY  10009
-    #define PRFERR_KEY_EXISTS   10010
+    #define ERROR_PRF_FIRST             42000
+
+    #define PRFERR_DATASIZE             (ERROR_PRF_FIRST + 1)
+                    // couldn't query data size for key
+    #define PRFERR_READ                 (ERROR_PRF_FIRST + 2)
+                    // couldn't read data from source (PrfQueryProfileData error)
+    #define PRFERR_WRITE                (ERROR_PRF_FIRST + 3)
+                    // couldn't write data to target (PrfWriteProfileData error)
+    #define PRFERR_APPSLIST             (ERROR_PRF_FIRST + 4)
+                    // couldn't query apps list
+    #define PRFERR_KEYSLIST             (ERROR_PRF_FIRST + 5)
+                    // couldn't query keys list
+    #define PRFERR_ABORTED              (ERROR_PRF_FIRST + 6)
+                    // aborted by user
+    #define PRFERR_QUERY                (ERROR_PRF_FIRST + 7)
+                    // PrfQueryProfile failed
+    #define PRFERR_INVALID_FILE_NAME    (ERROR_PRF_FIRST + 8)
+                    // profile names don't contain .INI
+    #define PRFERR_INVALID_KEY          (ERROR_PRF_FIRST + 9)
+    #define PRFERR_KEY_EXISTS           (ERROR_PRF_FIRST + 10)
+
+    #define PRFERR_RESET                (ERROR_PRF_FIRST + 11)
+                    // PrfReset failed V0.9.19 (2002-04-02) [umoeller]
+
+    #define ERROR_PRF_LAST              (ERROR_PRF_FIRST + 11)
 
     /* ******************************************************************
@@ -218 +233 @@
                         const char *pcszNewKey);
 
-    BOOL prfhSetUserProfile(HAB hab,
-                            const char *pcszUserProfile);
+    APIRET prfhSetUserProfile(HAB hab,
+                              const char *pcszUserProfile);
 
     ULONG prfhINIError(ULONG ulOptions,

trunk/include/helpers/stringh.h

@@ -67 +67 @@
                              const char *pszSource,
                              ULONG cbSource);
+
+    ULONG XWPENTRY strhlen(PCSZ pcsz);
 
     ULONG XWPENTRY strhSize(PCSZ pcsz);

trunk/include/helpers/wphandle.h

@@ -43 +43 @@
 
     #define ERROR_WPH_FIRST                         41000
+
     #define ERROR_WPH_CRASHED                       (ERROR_WPH_FIRST +   0)
     #define ERROR_WPH_NO_BASECLASS_DATA             (ERROR_WPH_FIRST +   1)
@@ -58 +59 @@
     #define ERROR_WPH_NOT_FILESYSTEM_HANDLE         (ERROR_WPH_FIRST +  13)
 
+    #define ERROR_WPH_LAST                          (ERROR_WPH_FIRST +  13)
+
     /* ******************************************************************
      *

trunk/include/helpers/xml.h

@@ -95 +95 @@
     #define ERROR_DOM_INVALID_EXTERNAL_HANDLER (ERROR_XML_FIRST + 48)
 
+    #define ERROR_XML_LAST                  (ERROR_XML_FIRST + 48)
+
     const char* xmlDescribeError(int code);
 

trunk/include/helpers/xstring.h

@@ -240 +240 @@
     typedef XSTRCONVERTLINEFORMAT *PXSTRCONVERTLINEFORMAT;
 
+    VOID xstrPrintf(XSTRING *pstr,
+                    PCSZ pcszFormat,
+                    ...);
+
 #endif