Changeset 15 for trunk/include

Timestamp:

Dec 11, 2000, 8:54:20 AM (25 years ago)

Author:

umoeller

Message:

Coupla bugfixes.

Location:

trunk/include

Files:

• helpers/cnrh.h (modified) (1 diff)
• helpers/dosh.h (modified) (1 diff)
• helpers/undoc.h (modified) (1 diff)
• helpers/xstring.h (modified) (5 diffs)
• setup.h (modified) (1 diff)

trunk/include/helpers/cnrh.h

@@ -347 +347 @@
      *
      *      <B>Target emphasis:</B>
+     *
      *      For Name, Text, and Details view, per default target emphasis
      *      during d'n'd is only displayed _around_ the record core.
+     *      This allows users to drop records onto each other.
      *      If you add CA_ORDEREDTARGETEMPH, target emphasis is only
-     *      displayed _below_ the record core. If you add CA_MIXEDTARGETEMPH,
-     *      both emphasis types are possible.
+     *      displayed _between_ records (to reorder records).
+     *      If you add CA_MIXEDTARGETEMPH, both emphasis types are possible.
      *
      *      Additional flags for _all_ views:

trunk/include/helpers/dosh.h

@@ -46 +46 @@
 
     BOOL doshIsWarp4(VOID);
-
-    APIRET doshQueryAvailPhysMem(PULONG pulMem,
-                                 ULONG ulLogicalSwapDrive);
 
     PSZ doshQuerySysErrorMsg(APIRET arc);

trunk/include/helpers/undoc.h

@@ -73 +73 @@
 
     /*
+     *  WPS object styles
+     *      V0.9.7 (2000-12-10) [umoeller]
+     */
+
+    #ifndef OBJSTYLE_LOCKEDINPLACE
+        #define OBJSTYLE_LOCKEDINPLACE  0x00020000
+    #endif
+
+    /*
      * Some more OS/2 default menu items:
      *

trunk/include/helpers/xstring.h

@@ -55 +55 @@
 
     void XWPENTRY xstrInitSet(PXSTRING pxstr, PSZ pszNew);
+    typedef void XWPENTRY XSTRINITSET(PXSTRING pxstr, PSZ pszNew);
+    typedef XSTRINITSET *PXSTRINITSET;
 
     void XWPENTRY xstrInitCopy(PXSTRING pxstr, const char *pcszSource);
+    typedef void XWPENTRY XSTRINITCOPY(PXSTRING pxstr, const char *pcszSource);
+    typedef XSTRINITCOPY *PXSTRINITCOPY;
 
     void XWPENTRY xstrClear(PXSTRING pxstr);
@@ -63 +67 @@
 
     PXSTRING XWPENTRY xstrCreate(ULONG ulPreAllocate);
+    typedef PXSTRING XWPENTRY XSTRCREATE(ULONG ulPreAllocate);
+    typedef XSTRCREATE *PXSTRCREATE;
 
     VOID XWPENTRY xstrFree(PXSTRING pxstr);
+    typedef VOID XWPENTRY XSTRFREE(PXSTRING pxstr);
+    typedef XSTRFREE *PXSTRFREE;
 
     ULONG XWPENTRY xstrset(PXSTRING pxstr, PSZ pszNew);
+    typedef ULONG XWPENTRY XSTRSET(PXSTRING pxstr, PSZ pszNew);
+    typedef XSTRSET *PXSTRSET;
 
     ULONG XWPENTRY xstrcpy(PXSTRING pxstr, const char *pcszSource);
+    typedef ULONG XWPENTRY XSTRCPY(PXSTRING pxstr, const char *pcszSource);
+    typedef XSTRCPY *PXSTRCPY;
 
     ULONG XWPENTRY xstrcat(PXSTRING pxstr, const char *pcszSource);
     typedef ULONG XWPENTRY XSTRCAT(PXSTRING pxstr, const char *pcszSource);
     typedef XSTRCAT *PXSTRCAT;
+
+    ULONG XWPENTRY xstrcatc(PXSTRING pxstr, CHAR c);
+    typedef ULONG XWPENTRY XSTRCATC(PXSTRING pxstr, CHAR c);
+    typedef XSTRCATC *PXSTRCATC;
 
     /*
@@ -90 +106 @@
                               const char *pcszBeginChars,
                               const char *pcszEndChars);
+    typedef PSZ XWPENTRY XSTRFINDWORD(const XSTRING *pxstr,
+                                      ULONG ulOfs,
+                                      const XSTRING *pstrFind,
+                                      size_t *pShiftTable,
+                                      PBOOL pfRepeatFind,
+                                      const char *pcszBeginChars,
+                                      const char *pcszEndChars);
+    typedef XSTRFINDWORD *PXSTRFINDWORD;
 
     ULONG XWPENTRY xstrrpl(PXSTRING pxstr,
@@ -97 +121 @@
                            size_t *pShiftTable,
                            PBOOL pfRepeatFind);
+    typedef ULONG XWPENTRY XSTRRPL(PXSTRING pxstr,
+                                   PULONG pulOfs,
+                                   const XSTRING *pstrSearch,
+                                   const XSTRING *pstrReplace,
+                                   size_t *pShiftTable,
+                                   PBOOL pfRepeatFind);
+    typedef XSTRRPL *PXSTRRPL;
 
     ULONG XWPENTRY xstrcrpl(PXSTRING pxstr,
@@ -102 +133 @@
                             const char *pcszSearch,
                             const char *pcszReplace);
+    typedef ULONG XWPENTRY XSTRCRPL(PXSTRING pxstr,
+                                    PULONG pulOfs,
+                                    const char *pcszSearch,
+                                    const char *pcszReplace);
+    typedef XSTRCRPL *PXSTRCRPL;
 #endif
 

trunk/include/setup.h

@@ -8 +8 @@
 #ifndef SETUP_HEADER_INCLUDED
     #define SETUP_HEADER_INCLUDED
+
+    // XWPEXPORT defines the standard linkage for the
+    // XWorkplace helpers.
+    #ifdef __EMX__
+        #define XWPENTRY
+    #elif defined (__IBMCPP__) || defined (__IBMC__)
+        #define XWPENTRY _Optlink
+    #endif
 
     /*************************************************************