Changeset 229

Timestamp:

Nov 24, 2002, 9:45:05 PM (23 years ago)

Author:

umoeller

Message:

Sources as of 1.0.0.

Location:

trunk

Files:

• CVSROOT/commitinfo (modified) (1 diff)
• CVSROOT/writeinfo (modified) (1 diff)
• include/helpers/comctl.h (modified) (1 diff)
• include/helpers/dialog.h (modified) (3 diffs)
• include/helpers/dosh.h (modified) (2 diffs)
• include/helpers/lan.h (modified) (2 diffs)
• include/helpers/pmsems.h (modified) (1 diff)
• include/helpers/prfh.h (modified) (2 diffs)
• include/helpers/xprf.h (modified) (5 diffs)
• src/helpers/apps.c (modified) (11 diffs)
• src/helpers/cctl_checkcnr.c (modified) (3 diffs)
• src/helpers/cctl_splitwin.c (modified) (5 diffs)
• src/helpers/cctl_tooltip.c (modified) (5 diffs)
• src/helpers/cnrh.c (modified) (3 diffs)
• src/helpers/comctl.c (modified) (1 diff)
• src/helpers/debug.c (modified) (3 diffs)
• src/helpers/dialog.c (modified) (36 diffs)
• src/helpers/dosh.c (modified) (7 diffs)
• src/helpers/dosh2.c (modified) (2 diffs)
• src/helpers/encodings.c (modified) (5 diffs)
• src/helpers/except.c (modified) (12 diffs)
• src/helpers/exeh.c (modified) (6 diffs)
• src/helpers/gpih.c (modified) (3 diffs)
• src/helpers/lan.c (modified) (8 diffs)
• src/helpers/linklist.c (modified) (16 diffs)
• src/helpers/map_vac.c (modified) (1 diff)
• src/helpers/prfh2.c (modified) (3 diffs)
• src/helpers/procstat.c (modified) (2 diffs)
• src/helpers/textview.c (modified) (13 diffs)
• src/helpers/threads.c (modified) (2 diffs)
• src/helpers/winh.c (modified) (7 diffs)
• src/helpers/xml.c (modified) (5 diffs)
• src/helpers/xprf.c (modified) (23 diffs)
• src/helpers/xprf2.c (modified) (15 diffs)
• strrpl.exe (modified) ( previous)
• xdoc.exe (modified) ( previous)

trunk/CVSROOT/commitinfo

@@ -15 +15 @@
 # in addition to the first matching regex or "DEFAULT".
 ALL d:\NOSAADM\bin\cvssec.exe CHECKCOMMIT
+

trunk/CVSROOT/writeinfo

@@ -1 @@
-/                                 *
-/CVSROOT                          ktk
+/                                 umoeller
+/CVSROOT                          umoeller,ktk
+/include                          umoeller
+/src                              umoeller
+

trunk/include/helpers/comctl.h

@@ -481 +481 @@
     #define SBCF_3DSUNK              0x0100
     #define SBCF_3DEXPLORERSTYLE     0x0200
-                // new with V0.9.21 (2002-08-21) [umoeller]
+                // new with V1.0.0 (2002-08-21) [umoeller]
                 // this simulates the Warp 4 entry field margins around the
                 // right split window, but leaves the left window flat

trunk/include/helpers/dialog.h

@@ -106 +106 @@
                 // flags for winhAdjustControls; any combination of
                 // XAC_MOVEX, XAC_MOVEY, XAC_SIZEX, XAC_SIZEY
-                // removed V0.9.21 (2002-08-18) [umoeller]
+                // removed V1.0.0 (2002-08-18) [umoeller]
 
         SIZEL       szlDlgUnits;
@@ -244 +244 @@
 
     #define START_TABLE_EXT(fl)             { TYPE_START_NEW_TABLE, (ULONG)NULL, fl }
-                // added V0.9.21 (2002-08-16) [umoeller]
+                // added V1.0.0 (2002-08-16) [umoeller]
 
     #define START_TABLE_ALIGN START_TABLE_EXT(TABLE_ALIGN_COLUMNS)
@@ -251 +251 @@
 
     #define START_GROUP_TABLE_EXT(pDef, fl) { TYPE_START_NEW_TABLE, (ULONG)pDef, fl }
-                // added V0.9.21 (2002-08-16) [umoeller]
+                // added V1.0.0 (2002-08-16) [umoeller]
 
     #define START_GROUP_TABLE_ALIGN(pDef) START_GROUP_TABLE_EXT(pDef, TABLE_ALIGN_COLUMNS)

trunk/include/helpers/dosh.h

@@ -353 +353 @@
                             // drive was booted from
 
-                // media flags: all changed V0.9.21 (2002-08-31) [umoeller]
+                // media flags: all changed V1.0.0 (2002-08-31) [umoeller]
 
                 #define DFL_MEDIA_PRESENT               0x0100
@@ -371 +371 @@
                             // set for CD-ROMs only if the CD-ROM
                             // door is currently open
-                            // V0.9.21 (2002-08-31) [umoeller]
+                            // V1.0.0 (2002-08-31) [umoeller]
 
                 #define DFL_SUPPORTS_EAS                0x0800

trunk/include/helpers/lan.h

@@ -32 +32 @@
     #define LANH_HEADER_INCLUDED
 
-    APIRET lanInit(VOID);
+    #ifndef SNLEN
+        #define CNLEN           15                  /* Computer name length     */
+        #define UNCLEN          (CNLEN+2)           /* UNC computer name length */
+        #define NNLEN           12                  /* 8.3 Net name length      */
+        #define RMLEN           (UNCLEN+1+NNLEN)    /* Maximum remote name length */
+
+        #define SNLEN           15                  /* Service name length      */
+        #define STXTLEN         63                  /* Service text length      */
+    #endif
 
     #pragma pack(1)
+
+    /*
+     *@@ SERVER:
+     *
+     */
+
     typedef struct _SERVER
     {
@@ -44 +58 @@
         PSZ         pszComment;         // server comment
     } SERVER, *PSERVER;
+
+    /*
+     *@@ SERVICEBUF1:
+     *
+     */
+
+    typedef struct _SERVICEBUF1 // service_info_1
+    {
+        unsigned char   svci1_name[SNLEN+1];
+        unsigned short  svci1_status;
+        unsigned long   svci1_code;
+        unsigned short  svci1_pid;
+    } SERVICEBUF1, *PSERVICEBUF1;
+
+    /*
+     *@@ SERVICEBUF2:
+     *
+     */
+
+    typedef struct _SERVICEBUF2 // service_info_2
+    {
+        unsigned char   svci2_name[SNLEN+1];   /* service name                  */
+        unsigned short  svci2_status;          /* See status values below       */
+        unsigned long   svci2_code;            /* install code of service       */
+        unsigned short  svci2_pid;             /* pid of service program        */
+        unsigned char   svci2_text[STXTLEN+1]; /* text area for use by services */
+    } SERVICEBUF2, *PSERVICEBUF2;
+
     #pragma pack()
+
+    #ifndef SV_TYPE_ALL
+        #define SV_TYPE_ALL             0xFFFFFFFF   /* handy for NetServerEnum2 */
+    #endif
+
+    #ifndef SERVICE_INSTALL_STATE
+        #define SERVICE_INSTALL_STATE           0x03
+        #define SERVICE_UNINSTALLED             0x00
+                    // service stopped (not running)
+        #define SERVICE_INSTALL_PENDING         0x01
+                    // service start pending
+        #define SERVICE_UNINSTALL_PENDING       0x02
+                    // service stop pending
+        #define SERVICE_INSTALLED               0x03
+                    // service started
+
+        #define SERVICE_PAUSE_STATE             0x0C
+        #define SERVICE_ACTIVE                  0x00
+                    // service active (not paused)
+        #define SERVICE_CONTINUE_PENDING        0x04
+                    // service continue pending
+        #define SERVICE_PAUSE_PENDING           0x08
+                    // service pause pending
+        #define SERVICE_PAUSED                  0x0C
+                    // service paused
+
+        #define SERVICE_NOT_UNINSTALLABLE       0x00
+                    // service cannot be stopped
+        #define SERVICE_UNINSTALLABLE           0x10
+                    // service can be stopped
+
+        #define SERVICE_NOT_PAUSABLE            0x00
+                    // service cannot be paused
+        #define SERVICE_PAUSABLE                0x20
+                    // service can be paused
+
+        /* Requester service only:
+         * Bits 8,9,10 -- redirection paused/active */
+
+        #define SERVICE_REDIR_PAUSED            0x700
+        #define SERVICE_REDIR_DISK_PAUSED       0x100
+                    // redirector for disks paused
+        #define SERVICE_REDIR_PRINT_PAUSED      0x200
+                    // redirector for spooled devices paused
+        #define SERVICE_REDIR_COMM_PAUSED       0x400
+                    // redirector for serial devices paused
+
+        #define SERVICE_CTRL_INTERROGATE        0
+        #define SERVICE_CTRL_PAUSE              1
+        #define SERVICE_CTRL_CONTINUE           2
+        #define SERVICE_CTRL_UNINSTALL          3
+    #endif
+
+    APIRET lanInit(VOID);
 
     APIRET lanQueryServers(PSERVER *paServers,
                            ULONG *pcServers);
 
+    APIRET lanServiceGetInfo(PCSZ pcszServiceName,
+                             PSERVICEBUF2 pBuf);
+
+    APIRET lanServiceInstall(PCSZ pcszServiceName,
+                             PSERVICEBUF2 pBuf2);
+
+    APIRET lanServiceControl(PCSZ pcszServiceName,
+                             ULONG opcode,
+                             PSERVICEBUF2 pBuf2);
 #endif
 

trunk/include/helpers/pmsems.h

@@ -39 +39 @@
      *      the OS/2 debugging handbook.
      *
-     *@@added V0.9.21 (2002-08-12) [umoeller]
+     *@@added V1.0.0 (2002-08-12) [umoeller]
      */
 

trunk/include/helpers/prfh.h

@@ -65 +65 @@
                     // PrfReset failed V0.9.19 (2002-04-02) [umoeller]
 
-    #define ERROR_PRF_LAST              (ERROR_PRF_FIRST + 11)
+    #define PRFERR_INVALID_APP_NAME     (ERROR_PRF_FIRST + 12)
+                    // V1.0.0 (2002-09-17) [umoeller]
+    #define PRFERR_INVALID_KEY_NAME     (ERROR_PRF_FIRST + 13)
+                    // V1.0.0 (2002-09-17) [umoeller]
+
+    #define ERROR_PRF_LAST              (ERROR_PRF_FIRST + 13)
 
     /* ******************************************************************
@@ -110 +115 @@
             // V0.9.19 (2002-04-17) [umoeller]
 
-    // class replacements list V0.9.21 (2002-08-26) [umoeller]
+    // class replacements list V1.0.0 (2002-08-26) [umoeller]
     DECLARE_PRFH_STRING(WPINIAPP_REPLACEMENTS, "PM_Workplace:ReplaceList");
 

trunk/include/helpers/xprf.h

@@ -135 +135 @@
      ********************************************************************/
 
-    #define XINI_MAGIC_BYTES    "hjba78j,"
-
     #ifdef LINKLIST_HEADER_INCLUDED
+
+        #define XINI_MAGIC_BYTES "xpRfMa\x03"
+
         /*
          *@@ XINI:
@@ -151 +152 @@
             CHAR    acMagic[sizeof(XINI_MAGIC_BYTES)];
                                 // magic bytes for security
+                                // removed V1.0.0 (2002-09-20) [umoeller]
             CHAR    szFilename[CCHMAXPATH];
+
             HFILE   hFile;      // returned by DosProtectOpen
-            FHLOCK  hLock;      // lock ID of DosProtectOpen
+            // FHLOCK  hLock;      // lock ID of DosProtectOpen
+                        // removed V1.0.0 (2002-09-20) [umoeller]
             BOOL    fDirty;     // TRUE if changed and needs to be flushed
                                 // on close
@@ -159 +163 @@
             // applications list
             LINKLIST    llApps;             // contains PXINIAPPDATA items
-            ULONG       cApps;              // count of items on list
         } XINI, *PXINI;
     #else
@@ -168 +171 @@
                            PXINI *ppxini);
 
-    BOOL xprfCloseProfile(PXINI hIni);
-
-    /* BOOL xprfQueryProfileData(PXINI hIni,
-                       const char *pcszApp,
-                       const char *pcszKey,
-                       PVOID pBuffer,
-                       PULONG pulBufferMax); */
-
-    BOOL xprfWriteProfileData(PXINI hIni,
-                       const char *pcszApp,
-                       const char *pcszKey,
-                       PVOID pData,
-                       ULONG ulDataLen);
+    APIRET xprfCloseProfile(PXINI hIni);
+
+    APIRET xprfQueryProfileSize(PXINI pXIni,
+                                PCSZ pszAppName,
+                                PCSZ pszKeyName,
+                                PULONG pulDataLen);
+
+    APIRET xprfQueryProfileData(PXINI pXIni,
+                                PCSZ pszAppName,
+                                PCSZ pszKeyName,
+                                PVOID pBuffer,
+                                PULONG pulBufferMax);
+
+    APIRET xprfWriteProfileData(PXINI hIni,
+                                const char *pcszApp,
+                                const char *pcszKey,
+                                PVOID pData,
+                                ULONG ulDataLen);
+
+    APIRET xprfQueryKeysForApp(PXINI hIni,
+                               PCSZ pcszApp,
+                               PSZ *ppszKeys);
 
     /* ******************************************************************
@@ -209 +221 @@
 
     APIRET xprfCopyKey(HINI hiniSource,
-                       PSZ pszSourceApp,
-                       PSZ pszKey,
+                       PCSZ pszSourceApp,
+                       PCSZ pszKey,
                        PXINI hiniTarget,
-                       PSZ pszTargetApp);
+                       PCSZ pszTargetApp);
+
+    APIRET xprfCopyKey2(PXINI hiniSource,
+                        PCSZ pszSourceApp,
+                        PCSZ pszKey,
+                        HINI hiniTarget,
+                        PCSZ pszTargetApp);
 
     APIRET xprfCopyApp(HINI hiniSource,
-                       PSZ pszSourceApp,
+                       PCSZ pszSourceApp,
                        PXINI hiniTarget,
-                       PSZ pszTargetApp,
+                       PCSZ pszTargetApp,
                        PSZ pszErrorKey);
 
+    APIRET xprfCopyApp2(PXINI hiniSource,
+                        PCSZ pszSourceApp,
+                        HINI hiniTarget,
+                        PCSZ pszTargetApp,
+                        PSZ pszErrorKey);
+
     APIRET xprfCopyProfile(HINI hOld,
-                           PSZ pszNew,
+                           PCSZ pszNew,
                            PFN_PRF_PROGRESS pfnProgressCallback,
                            ULONG ulUser,
                            ULONG ulCount,
-                           ULONG ulMax);
+                           ULONG ulMax,
+                           PSZ pszFailingApp);
 
     APIRET xprfSaveINIs(HAB hab,
                         PFN_PRF_PROGRESS pfnProgressCallback,
-                        ULONG ulUser);
+                        ULONG ulUser,
+                        PSZ pszFailingINI,
+                        PSZ pszFailingApp,
+                        PSZ pszFailingKey);
 #endif
 

trunk/src/helpers/apps.c

@@ -410 +410 @@
  *      representation in OS/2.)
  *
- *@@added V0.9.21 (2002-09-04) [bird]
+ *@@added V1.0.0 (2002-09-04) [bird]
  */
 
@@ -834 +834 @@
  *
  *@@added V0.9.20 (2002-07-03) [umoeller]
- *@@changed V0.9.21 (2002-08-21) [umoeller]: now allowing for UNC
+ *@@changed V1.0.0 (2002-08-21) [umoeller]: now allowing for UNC
  */
 
@@ -845 +845 @@
     // check if the executable is fully qualified; if so,
     // check if the executable file exists
-    if (    // allow UNC V0.9.21 (2002-08-21) [umoeller]
+    if (    // allow UNC V1.0.0 (2002-08-21) [umoeller]
             (    (pDetails->pszExecutable[0] == '\\')
               && (pDetails->pszExecutable[1] == '\\')
@@ -889 +889 @@
  *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from winh.c to apps.c
  *@@changed V0.9.20 (2002-07-03) [umoeller]: now always qualifying executable to fix broken BAT files
- *@@changed V0.9.21 (2002-08-12) [umoeller]: this didn't work for batch and cmd files that had "+" characters in their full path, fixed
+ *@@changed V1.0.0 (2002-08-12) [umoeller]: this didn't work for batch and cmd files that had "+" characters in their full path, fixed
  */
 
@@ -917 +917 @@
 
     // if the path has spaces, or other invalid characters,
-    // include it in quotes V0.9.21 (2002-08-12) [umoeller]
+    // include it in quotes V1.0.0 (2002-08-12) [umoeller]
     if (fQuotes = !!strpbrk(pProgDetails->pszExecutable, " +&|="))
         xstrcatc(pstrParams, '"');
@@ -931 +931 @@
 
     if (fQuotes)
-        xstrcatc(pstrParams, '"');      // V0.9.21 (2002-08-12) [umoeller]
+        xstrcatc(pstrParams, '"');      // V1.0.0 (2002-08-12) [umoeller]
 
     if (pszOldParams)
@@ -1128 +1128 @@
  *@@changed V0.9.20 (2002-07-03) [umoeller]: fixed Win-OS/2 full screen breakage
  *@@changed V0.9.20 (2002-07-03) [umoeller]: fixed broken bat and cmd files when PROG_DEFAULT was set
- *@@changed V0.9.21 (2002-08-18) [umoeller]: fixed cmd and bat files that had "=" in their paths
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: fixed cmd and bat files that had "=" in their paths
  */
 
@@ -1144 +1144 @@
     ULONG           ulIsWinApp;
 
-    // parameter checking extended V0.9.21 (2002-08-21) [umoeller]
+    // parameter checking extended V1.0.0 (2002-08-21) [umoeller]
     if (    (!pcProgDetails)
          || (!pcProgDetails->pszExecutable)
@@ -1308 +1308 @@
             }
 
-// V0.9.21: this define is never set. I have thus completely
+// V1.0.0: this define is never set. I have thus completely
 // disabled the batch hacks that we used to provide, that is
 // we no longer change the "c:\path\batch.cmd" to "cmd.exe /c c:\path\batch.cmd"
@@ -2016 +2016 @@
  *@@changed V0.9.20 (2002-08-10) [umoeller]: fixed missing destroy window, made wait optional
  *@@changed V0.9.20 (2002-08-10) [umoeller]: added pcszWorkingDir
- *@@changed V0.9.21 (2002-08-18) [umoeller]: changed prototype to return APIRET
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: changed prototype to return APIRET
  */
 
@@ -2083 +2083 @@
  *
  *@@added V0.9.20 (2002-08-10) [umoeller]
- *@@changed V0.9.21 (2002-08-21) [umoeller]: changed prototype to return browser
+ *@@changed V1.0.0 (2002-08-21) [umoeller]: changed prototype to return browser
  */
 

trunk/src/helpers/cctl_checkcnr.c

@@ -863 +863 @@
  *@@ FINDCHECKRECORD:
  *
- *@@added V0.9.21 (2002-09-09) [umoeller]
+ *@@added V1.0.0 (2002-09-09) [umoeller]
  */
 
@@ -882 +882 @@
  *
  *@@added V0.9.0 (99-11-28) [umoeller]
- *@@changed V0.9.21 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
+ *@@changed V1.0.0 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
  */
 
@@ -907 +907 @@
  *
  *@@added V0.9.1 (99-12-03) [umoeller]
- *@@changed V0.9.21 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
+ *@@changed V1.0.0 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
  */
 

trunk/src/helpers/cctl_splitwin.c

@@ -95 +95 @@
  *
  *@@added V0.9.1 (2000-02-05) [umoeller]
- *@@changed V0.9.21 (2002-08-24) [umoeller]: added SBCF_3DEXPLORERSTYLE
+ *@@changed V1.0.0 (2002-08-24) [umoeller]: added SBCF_3DEXPLORERSTYLE
  */
 
@@ -118 +118 @@
             if (pData->sbcd.ulCreateFlags & SBCF_3DEXPLORERSTYLE)
             {
-                // this style is new with V0.9.21 (2002-08-24) [umoeller];
+                // this style is new with V1.0.0 (2002-08-24) [umoeller];
                 // simulate the Warp 4 entry field margins around the
                 // right control only, but leave the left control flat.
@@ -443 +443 @@
 
         if (!(pData->sbcd.ulCreateFlags & (SBCF_3DSUNK | SBCF_3DEXPLORERSTYLE)))
-                        // V0.9.21 (2002-08-31) [umoeller]
+                        // V1.0.0 (2002-08-31) [umoeller]
         {
             GpiSetColor(hps, pData->lcol3DLight);
@@ -797 +797 @@
                 pData->hwndLinked2 = NULLHANDLE;
 
-                // caching these colors now V0.9.21 (2002-08-21) [umoeller]
+                // caching these colors now V1.0.0 (2002-08-21) [umoeller]
                 pData->lcol3DDark = WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONDARK, 0);
                 pData->lcol3DLight = WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONLIGHT, 0);
@@ -823 +823 @@
  *
  *@@added V0.9.0 [umoeller]
- *@@changed V0.9.21 (2002-08-24) [umoeller]: added support for SBCF_3DEXPLORERSTYLE
+ *@@changed V1.0.0 (2002-08-24) [umoeller]: added support for SBCF_3DEXPLORERSTYLE
  */
 

trunk/src/helpers/cctl_tooltip.c

@@ -224 +224 @@
     MRESULT mrc = 0;
 
-    PFNWP           pfnwpOrig = NULL;
+    PFNWP   pfnwpOrig = NULL;
 
     if (LockSubclassedTools())
     {
-        PSUBCLASSEDTOOL pst = FindSubclassedTool(hwndTool);
-
-        if (pst)
+        PSUBCLASSEDTOOL pst;
+
+        if (pst = FindSubclassedTool(hwndTool))
         {
             pfnwpOrig = pst->pfnwpOrig;     // call default
@@ -254 +254 @@
                                (MPARAM)0,
                                (MPARAM)&qmsg);
-                break; }
+                }
+                break;
 
                 case WM_DESTROY:
-                    lstRemoveItem(&G_llSubclassedTools, pst);         // this frees the item
+                    lstRemoveItem(&G_llSubclassedTools, pst);
+                            // this frees the item
                 break;
             }
@@ -1466 +1468 @@
 
             case WM_PRESPARAMCHANGED:
-            {
-                LONG    lPPIndex = (LONG)mp1;
-                switch (lPPIndex)
+
+                switch ((LONG)mp1)      // pp index
                 {
                     case 0:     // layout palette thing dropped
@@ -1478 +1479 @@
                         UpdateTooltipPresColors(hwndTooltip);
                 }
-            break; }
+
+            break;
 
             /*
@@ -1900 +1902 @@
                 PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
                 mrc = (MPARAM)lstCountItems(&pttd->llTools);
-            break; }
+            }
+            break;
 
             /*

trunk/src/helpers/cnrh.c

@@ -1579 +1579 @@
  *
  *@@added V0.9.0 [umoeller]
- *@@changed V0.9.21 (2002-09-09) [umoeller]: rewritten to support deletion in callback
- *@@changed V0.9.21 (2002-09-09) [umoeller]: added support for precParent = -1
- *@@changed V0.9.21 (2002-09-09) [umoeller]: changed prototype and callback prototype
+ *@@changed V1.0.0 (2002-09-09) [umoeller]: rewritten to support deletion in callback
+ *@@changed V1.0.0 (2002-09-09) [umoeller]: added support for precParent = -1
+ *@@changed V1.0.0 (2002-09-09) [umoeller]: changed prototype and callback prototype
  */
 
@@ -1622 +1622 @@
         // get the next record BEFORE calling the callback
         // in case the callback removes the record
-        // V0.9.21 (2002-09-09) [umoeller]
+        // V1.0.0 (2002-09-09) [umoeller]
         PRECORDCORE precNext = (PRECORDCORE)WinSendMsg(hwndCnr,
                                                        CM_QUERYRECORD,
@@ -1629 +1629 @@
                                                                     CMA_ITEMORDER));
 
-        if (fRecurse)   // V0.9.21 (2002-09-09) [umoeller]
+        if (fRecurse)   // V1.0.0 (2002-09-09) [umoeller]
             // recurse for the record we found
             ulrc += cnrhForAllRecords(hwndCnr,

trunk/src/helpers/comctl.c

@@ -182 +182 @@
  *      turns the given static control into a 3D separator line.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 

trunk/src/helpers/debug.c

@@ -44 +44 @@
  */
 
-//#define DEBUG_SYMDUMP // enable to dump sym file to log V0.9.21 (2002-08-21) [paperino]
+//#define DEBUG_SYMDUMP // enable to dump sym file to log V1.0.0 (2002-08-21) [paperino]
 
 #define OS2EMX_PLAIN_CHAR
@@ -1537 +1537 @@
 
     // open .SYM file
-#ifdef DEBUG_SYMDUMP    // V0.9.21 (2002-08-21) [paperino]
+#ifdef DEBUG_SYMDUMP    // V1.0.0 (2002-08-21) [paperino]
     fprintf(LogFile,"Dump of '%s' for object %d\n",SymFileName,Object);
 #endif
@@ -1591 +1591 @@
             for (SymNum = 0; SymNum < SegDef.cSymbols; SymNum++)
             {
-                // fixed syms > 64 K V0.9.21 (2002-08-21) [paperino]
+                // fixed syms > 64 K V1.0.0 (2002-08-21) [paperino]
                 if (SegDef.bFlags & 0x01)
                 {

trunk/src/helpers/dialog.c

@@ -11 +11 @@
  *
  *      See @dlg_algorithm for the gory details of the new
- *      algorithm used since V0.9.21. Even though much
+ *      algorithm used since V1.0.0. Even though much
  *      of this file was rewritten, the new dialog is
  *      backwards-compatible with all the hacks that existing
@@ -254 +254 @@
  *
  *      We now use the CSS box model for the dialog
- *      formatter (V0.9.21).
+ *      formatter (V1.0.0).
  *
  +      ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
@@ -323 +323 @@
  *          certain controls automatically. See CalcAutoSize.
  *
- *      The algorithm used here has been greatly reworked with V0.9.21.
+ *      The algorithm used here has been greatly reworked with V1.0.0.
  *      Essentially, the new trick is that we first compute all widths
  *      (which requires several iterations since widths may now inherit
@@ -573 +573 @@
  *
  *      See @dlg_algorithm for the new algorithm
- *      used since V0.9.21.
- *
- *      With V0.9.21, we now follow the CSS box model
+ *      used since V1.0.0.
+ *
+ *      With V1.0.0, we now follow the CSS box model
  *      to render these things better without all
  *      the hacks I am no longer able to understand
  *      myself. See @dlg_box_model for details.
  *
- *@@changed V0.9.21 (2002-08-18) [umoeller]: completely replaced
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: completely replaced
  */
 
@@ -602 +602 @@
 
     ULONG       ulColumnIndex;      // zero-based column index in parent row
-                                    // V0.9.21 (2002-08-18) [umoeller]
+                                    // V1.0.0 (2002-08-18) [umoeller]
 
     // b) information for control window to be created:
@@ -628 +628 @@
     RECTL       rclPadding,         // spacing, in pixels, to apply to the four borders of
                 rclMargin;          // the content to get the box; calculated from CONTROLDEF
-                                    // V0.9.21 (2002-08-16) [umoeller]
+                                    // V1.0.0 (2002-08-16) [umoeller]
 
     LONG        cxSpacingTotal;     // sum of rclPadding and rclMargin xLeft and
@@ -684 +684 @@
 
     ULONG       cColumns;           // no. of columns in this row
-                                    // V0.9.21 (2002-08-18) [umoeller]
+                                    // V1.0.0 (2002-08-18) [umoeller]
 
     // result data after recursion:
@@ -767 +767 @@
  *      set.
  *
- *@@added V0.9.21 (2002-08-16) [umoeller]
+ *@@added V1.0.0 (2002-08-16) [umoeller]
  */
 
@@ -827 +827 @@
  *      set.
  *
- *@@added V0.9.21 (2002-08-16) [umoeller]
+ *@@added V1.0.0 (2002-08-16) [umoeller]
  */
 
@@ -949 +949 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: added APIRET
  *@@changed V0.9.16 (2002-02-02) [umoeller]: added ulWidth
- *@@changed V0.9.21 (2002-08-18) [umoeller]: renamed; moved multi-line processing to CalcAutoSizeTextMulti
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: renamed; moved multi-line processing to CalcAutoSizeTextMulti
  */
 
@@ -984 +984 @@
  *      static text controls.
  *
- *@@added V0.9.21 (2002-08-18) [umoeller]
+ *@@added V1.0.0 (2002-08-18) [umoeller]
  */
 
@@ -1030 +1030 @@
  *
  *@@added V0.9.20 (2002-08-10) [umoeller]
- *@@changed V0.9.21 (2002-08-18) [umoeller]: removed temp windows list
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: removed temp windows list
  */
 
@@ -1224 +1224 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: added APIRET
  *@@changed V0.9.19 (2002-04-24) [umoeller]: fixed PM groups alignment
- *@@changed V0.9.21 (2002-08-16) [umoeller]: adjusted for new algorithm
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: adjusted for new algorithm
  */
 
@@ -1290 +1290 @@
  *@@changed V0.9.19 (2002-04-17) [umoeller]: fixes for the STUPID drop-down comboboxes
  *@@changed V0.9.19 (2002-04-24) [umoeller]: fixed PM groups alignment
- *@@changed V0.9.21 (2002-08-16) [umoeller]: adjusted for new algorithm
- *@@changed V0.9.21 (2002-08-18) [umoeller]: setting entry field length to CCHMAXPATH per default now
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: adjusted for new algorithm
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: setting entry field length to CCHMAXPATH per default now
  */
 
@@ -1323 +1323 @@
                 flStyle = pColumn->flStyle;
 
-                // V0.9.21 (2002-08-16) [umoeller]
+                // V1.0.0 (2002-08-16) [umoeller]
                 // Removed all the terrible hacks for the PM group
                 // control. We now use rclPadding and rclMargin
@@ -1355 +1355 @@
     }
 
-    if (    (!arc)            // check error code V0.9.21 (2002-08-16) [umoeller]
+    if (    (!arc)            // check error code V1.0.0 (2002-08-16) [umoeller]
          && (pcszClass)
        )
@@ -1365 +1365 @@
         PCSZ        pcszTextEF = NULL;          // for entry field
 
-        // V0.9.21 (2002-08-16) [umoeller]
+        // V1.0.0 (2002-08-16) [umoeller]
         // determine the position where to create the
         // control; this is the content box, to which
@@ -1448 +1448 @@
                     // defer setting the text because we should
                     // first set the entry field limit
-                    // V0.9.21 (2002-08-18) [umoeller]
+                    // V1.0.0 (2002-08-18) [umoeller]
                     pcszTextEF = pcszText;
                     pcszText = "";          // for now
@@ -1532 +1532 @@
                     // set text limit to CCHMAXPATH per default,
                     // and set the real text now
-                    // V0.9.21 (2002-08-18) [umoeller]
+                    // V1.0.0 (2002-08-18) [umoeller]
                     winhSetEntryFieldLimit(pColumn->hwndControl, CCHMAXPATH);
                     WinSetWindowText(pColumn->hwndControl, (PSZ)pcszTextEF);
@@ -1634 +1634 @@
  *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed font problems
  *@@changed V0.9.20 (2002-08-08) [umoeller]: added support for aligning columns horizontally
- *@@changed V0.9.21 (2002-08-16) [umoeller]: calc size rewritten for new algorithm
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: calc size rewritten for new algorithm
  */
 
@@ -1655 +1655 @@
 
         case PROCESS_1_CALC_MIN_WIDTHS:
-            // rewritten V0.9.21 (2002-08-16) [umoeller]
+            // rewritten V1.0.0 (2002-08-16) [umoeller]
 
             if (!pColumn->pNestedTable)
@@ -1723 +1723 @@
 
         case PROCESS_2_CALC_RELATIVE_WIDTHS:
-            // rewritten V0.9.21 (2002-08-16) [umoeller]
+            // rewritten V1.0.0 (2002-08-16) [umoeller]
 
             if (!pColumn->pNestedTable)
@@ -1816 +1816 @@
 
         case PROCESS_3_ALIGN_COLUMNS:
-            // rewritten V0.9.21 (2002-08-16) [umoeller]
+            // rewritten V1.0.0 (2002-08-16) [umoeller]
 
             if (!pColumn->pNestedTable)
@@ -2101 +2101 @@
  *      in the row.
  *
- *@@changed V0.9.21 (2002-08-16) [umoeller]: adjusted for new algorithm
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: adjusted for new algorithm
  */
 
@@ -2199 +2199 @@
  *      to which the nested table belongs.
  *
- *@@changed V0.9.21 (2002-08-16) [umoeller]: adjusted for new algorithm
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: adjusted for new algorithm
  */
 
@@ -2220 +2220 @@
             // as a separate step (PROCESS_2_INHERIT_TABLE_SIZES),
             // but we can save ourselves a loop here
-            // V0.9.21 (2002-08-16) [umoeller]
+            // V1.0.0 (2002-08-16) [umoeller]
             if (pTableDef->flTable & TABLE_INHERIT_SIZE)
             {
@@ -2393 +2393 @@
  *@@ CreateColumn:
  *
- *@@changed V0.9.21 (2002-08-18) [umoeller]: mostly rewritten for new algorithm
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: mostly rewritten for new algorithm
  */
 
@@ -2491 +2491 @@
                                       + pColumn->rclMargin.xRight;
 
-            // set the column index V0.9.21 (2002-08-18) [umoeller]
+            // set the column index V1.0.0 (2002-08-18) [umoeller]
             pColumn->ulColumnIndex = (pCurrentRow->cColumns)++;
 
@@ -2745 +2745 @@
                                          pCurrentRow,
                                          FALSE,        // no nested table
-                                         (const CONTROLDEF *)pItemThis->ul1, // pCtlDef, V0.9.21 (2002-08-18) [umoeller]
+                                         (const CONTROLDEF *)pItemThis->ul1, // pCtlDef, V1.0.0 (2002-08-18) [umoeller]
                                          &pColumn)))
                     lstAppendItem(&pCurrentRow->llColumns,
@@ -2804 +2804 @@
  *
  *@@added V0.9.15 (2001-08-26) [umoeller]
- *@@changed V0.9.21 (2002-08-16) [umoeller]: adjusted for new algorithm
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: adjusted for new algorithm
  */
 
@@ -2813 +2813 @@
     // call process mode with the first for "calc size"
     // process modes
-    // changed V0.9.21 (2002-08-16) [umoeller]
+    // changed V1.0.0 (2002-08-16) [umoeller]
     if (!(arc = ProcessAll(pDlgData,
                            PROCESS_1_CALC_MIN_WIDTHS)))
@@ -2996 +2996 @@
  *
  *      See @dlg_algorithm for the gory details of the new
- *      algorithm used since V0.9.21.
+ *      algorithm used since V1.0.0.
  *
  *      See @dlg_boxmodel for information about how the
@@ -3069 +3069 @@
  *@@changed V0.9.16 (2001-12-06) [umoeller]: fixed bad owner if not direct desktop child
  *@@changed V0.9.19 (2002-04-24) [umoeller]: added excpt handling
- +@@changed V0.9.21 (2002-08-21) [umoeller]: now setting wait pointer
+ +@@changed V1.0.0 (2002-08-21) [umoeller]: now setting wait pointer
  */
 
@@ -3084 +3084 @@
     APIRET      arc = NO_ERROR;
 
-    HPOINTER    hptrOld = winhSetWaitPointer();     // V0.9.21 (2002-08-21) [umoeller]
+    HPOINTER    hptrOld = winhSetWaitPointer();     // V1.0.0 (2002-08-21) [umoeller]
 
     TRY_LOUD(excpt1)
@@ -3246 +3246 @@
     }
 
-    WinSetPointer(HWND_DESKTOP, hptrOld); // V0.9.21 (2002-08-21) [umoeller]
+    WinSetPointer(HWND_DESKTOP, hptrOld); // V1.0.0 (2002-08-21) [umoeller]
 
     return arc;
@@ -3626 +3626 @@
  *@@changed V0.9.20 (2002-07-12) [umoeller]: made icon spacing wider
  *@@changed V0.9.20 (2002-08-10) [umoeller]: fixed missing close button
- *@@changed V0.9.21 (2002-08-16) [umoeller]: now using table alignment
+ *@@changed V1.0.0 (2002-08-16) [umoeller]: now using table alignment
  */
 

trunk/src/helpers/dosh.c

@@ -302 +302 @@
  *      buffer, which should be free()'d afterwards.
  *
+ *      The returned string is properly null-terminated but
+ *      should not end with a line break (\r or \n) if I see
+ *      this correctly.
+ *
  *      Returns NULL upon errors.
+ *
+ *@@changed V1.0.0 (2002-09-24) [umoeller]: now supporting NET messages as well
  */
 
 PSZ doshQuerySysErrorMsg(APIRET arc)    // in: DOS error code
 {
-    PSZ     pszReturn = 0;
+    PSZ     pszReturn = NULL;
     CHAR    szDosError[1000];
     ULONG   cbDosError = 0;
-    DosGetMessage(NULL, 0,       // no string replacements
-                  szDosError, sizeof(szDosError),
-                  arc,
-                  "OSO001.MSG",        // default OS/2 message file
-                  &cbDosError);
-    if (cbDosError > 2)
+    PCSZ    pcszMsgFile;
+
+    if (    (arc >= 2100)
+         && (arc <= 8000)
+       )
+        pcszMsgFile = "NET.MSG";
+    else
+        pcszMsgFile = "OSO001.MSG";        // default OS/2 message file
+
+    if (!DosGetMessage(NULL, 0,       // no string replacements
+                       szDosError, sizeof(szDosError),
+                       arc,
+                       (PSZ)pcszMsgFile,
+                       &cbDosError))
     {
         szDosError[cbDosError - 2] = 0;
         pszReturn = strdup(szDosError);
     }
-    return (pszReturn);
+
+    return pszReturn;
 }
 
@@ -728 +743 @@
  *      CD-ROM drive.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -785 +800 @@
  *      to close the device again.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -823 +838 @@
  *
  *@@added V0.9.14 (2001-08-01) [umoeller]
- *@@changed V0.9.21 (2002-08-31) [umoeller]: removed ulLogicalDrive which was not needed
+ *@@changed V1.0.0 (2002-08-31) [umoeller]: removed ulLogicalDrive which was not needed
  */
 
@@ -852 +867 @@
         else
         {
-            #pragma pack(1)         // V0.9.21 (2002-08-31) [umoeller]
+            #pragma pack(1)         // V1.0.0 (2002-08-31) [umoeller]
 
             struct {
@@ -959 +974 @@
  *      to find out if the door is open with OS/2.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -1146 +1161 @@
     HFILE   hf;
 
-    // exported this code to doshOpenDrive V0.9.21 (2002-08-31) [umoeller]
+    // exported this code to doshOpenDrive V1.0.0 (2002-08-31) [umoeller]
     arc = doshOpenDrive(ulLogicalDrive,
                         &hf);

trunk/src/helpers/dosh2.c

@@ -412 +412 @@
  *
  *@@added V0.9.16 (2001-10-08) [umoeller]
- */
-
-APIRET doshSearchPath(const char *pcszPath,     // in: path variable name (e.g. "PATH")
+ *@@changed V1.0.0 (2002-11-23) [umoeller]: allowing NULL pcszPath to search for "PATH"
+ */
+
+APIRET doshSearchPath(const char *pcszPath,     // in: path variable name; if NULL, we use "PATH"
                       const char *pcszFile,     // in: file to look for (e.g. "LVM.EXE")
                       PSZ pszExecutable,        // out: full path (e.g. "F:\os2\lvm.exe")
@@ -423 +424 @@
     // get the PATH value
     PCSZ pcszPathValue;
+
+    if (!pcszPath)
+        pcszPath = "PATH";      // V1.0.0 (2002-11-23) [umoeller]
+
     if (!(arc = DosScanEnv((PSZ)pcszPath,
 #if __cplusplus

trunk/src/helpers/encodings.c

@@ -13 +13 @@
  *
  *      Be warned, compilation of this file takes a long
- *      file because this includes all the complex codepages
+ *      time because this includes all the complex codepages
  *      from include\encodings.
  *
@@ -79 +79 @@
     unsigned long       cEntries;           // entries in map (array item count)
     unsigned short      usCodepageOS2;      // corresponding OS/2 codepage or 0 if none
-                                            // V0.9.21 (2002-08-21) [umoeller]
+                                            // V1.0.0 (2002-08-21) [umoeller]
     unsigned short      usLatin;            // ISO 8859-X correspondance or 0
     ENCBYTECOUNT        bc;
@@ -234 +234 @@
  *      and reuse it for future conversions. In addition,
  *      create codecs only for the codepages that are
- *      actually used. Each codec will take up
+ *      actually used. Each codec will take up to
  *      n * sizeof(USHORT) bytes, where n is the highest
  *      Unicode character used in the codepage.
@@ -355 +355 @@
 /*
  *@@ encFreeCodec:
- *      frees a codec created with encFreeConversion
+ *      frees a codec created with encCreateCodec
  *      and sets the given pointer to NULL.
  *
@@ -446 +446 @@
  *      pointer is advanced anyway).
  *
- *      This returns 0 if **ppch points to a
+ *      This returns 0 if *ppch points to a
  *      null character.
  *

trunk/src/helpers/except.c

@@ -451 +451 @@
  *@@changed V0.9.16 (2001-11-02) [pr]: make object display signed
  *@@changed V0.9.19 (2002-03-28) [umoeller]: added thread ordinal
- *@@changed V0.9.21 (2002-08-28) [umoeller]: added OS revision to dump
+ *@@changed V1.0.0 (2002-08-28) [umoeller]: added OS revision to dump
  */
 
@@ -508 +508 @@
     // generic exception info
     DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                    QSV_VERSION_REVISION,   // 13 V0.9.21 (2002-08-28) [umoeller]
+                    QSV_VERSION_REVISION,   // 13 V1.0.0 (2002-08-28) [umoeller]
                     &aulBuf, sizeof(aulBuf));
     // Warp 3 is reported as 20.30
@@ -527 +527 @@
             aulBuf[0],                      // major
             aulBuf[1],
-            aulBuf[2],              // revision V0.9.21 (2002-08-28) [umoeller]
+            aulBuf[2],              // revision V1.0.0 (2002-08-28) [umoeller]
             pcszVersion);
 
@@ -791 +791 @@
  *
  *      --  pfnExcOpenFileNew gets called to open
- *          the trap log file. This must return a FILE*
- *          pointer from fopen(). If this is not defined,
- *          ?:\TRAP.LOG is used. Use this to specify a
- *          different file and have some notes written
- *          into it before the actual exception info.
+ *          the trap log file. This can return a FILE*
+ *          pointer from fopen() (which will be closed
+ *          automatically by the handler).
+ *
+ *          If this hook is not defined, ?:\TRAP.LOG is
+ *          used. Use this hook to specify a different file
+ *          and have some notes written into it before the
+ *          actual exception info.
+ *
+ *          If the hook returns a null FILE* pointer,
+ *          logging is disabled, and the "loud" handler
+ *          effectively behaves like the "quiet" handler.
  *
  *      --  pfnExcHookNew gets called while the trap log
@@ -801 +808 @@
  *          the following info has been written into
  *          the trap log already:
+ *
  *          -- exception type/address block
+ *
  *          -- exception explanation
+ *
  *          -- process information
  *
@@ -890 +900 @@
 {
     /* From the VAC++3 docs:
-     *     "The first thing an exception handler should do is check the
-     *     exception flags. If EH_EXIT_UNWIND is set, meaning
-     *     the thread is ending, the handler tells the operating system
-     *     to pass the exception to the next exception handler. It does the
-     *     same if the EH_UNWINDING flag is set, the flag that indicates
-     *     this exception handler is being removed.
-     *     The EH_NESTED_CALL flag indicates whether the exception
-     *     occurred within an exception handler. If the handler does
-     *     not check this flag, recursive exceptions could occur until
-     *     there is no stack remaining."
-     * So for all these conditions, we exit immediately.
+     *      "The first thing an exception handler should do is check the
+     *      exception flags. If EH_EXIT_UNWIND is set, meaning
+     *      the thread is ending, the handler tells the operating system
+     *      to pass the exception to the next exception handler. It does the
+     *      same if the EH_UNWINDING flag is set, the flag that indicates
+     *      this exception handler is being removed.
+     *      The EH_NESTED_CALL flag indicates whether the exception
+     *      occurred within an exception handler. If the handler does
+     *      not check this flag, recursive exceptions could occur until
+     *      there is no stack remaining."
+     *
+     *      So for all these conditions, we exit immediately.
      */
 
     if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
 
     switch (pReportRec->ExceptionNum)
@@ -920 +931 @@
         {
             // "real" exceptions:
-            FILE *file;
+            FILE *file = NULL;
 
             // open traplog file;
             if (G_pfnExcOpenFile)
                 // hook defined for this: call it
-                file = (*G_pfnExcOpenFile)();
+                file = G_pfnExcOpenFile();
             else
             {
@@ -933 +944 @@
                 // boot drive
                 sprintf(szFileName, "%c:\\trap.log", doshQueryBootDrive());
-                file = fopen(szFileName, "a");
-
-                if (file)
+
+                if (file = fopen(szFileName, "a"))
                 {
                     DATETIME DT;
@@ -948 +958 @@
             }
 
-            // write error log
-            excExplainException(file,
-                                "excHandlerLoud",
-                                pReportRec,
-                                pContextRec);
-            fclose(file);
+            if (file)
+            {
+                // write error log
+                excExplainException(file,
+                                    "excHandlerLoud",
+                                    pReportRec,
+                                    pContextRec);
+                fclose(file);
+            }
 
             // copy report rec to user buffer
@@ -963 +976 @@
             // jump back to failing routine
             longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break; }
+        }
+        break;
     }
 
     // not handled
-    return (XCPT_CONTINUE_SEARCH);
+    return XCPT_CONTINUE_SEARCH;
 }
 
@@ -997 +1011 @@
 {
     if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
 
     switch (pReportRec->ExceptionNum)
@@ -1033 +1047 @@
             longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
         break;
-
-        default:
-             break;
     }
 
-    return (XCPT_CONTINUE_SEARCH);
+    return XCPT_CONTINUE_SEARCH;
 }
 

trunk/src/helpers/exeh.c

@@ -176 +176 @@
  *@@changed V0.9.16 (2001-12-08) [umoeller]: speed optimizations, changed some return codes
  *@@changed V0.9.16 (2002-01-04) [umoeller]: added fixes for COM, BAT, CMD extensions
- *@@changed V0.9.21 (2002-08-18) [umoeller]: this was completely broken for files without extensions (os2krnl)
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: this was completely broken for files without extensions (os2krnl)
  */
 
@@ -206 +206 @@
     {
         // has no extension: then open file!
-        // fixed V0.9.21 (2002-08-18) [umoeller]
+        // fixed V1.0.0 (2002-08-18) [umoeller]
         fOpenFile = TRUE;
     }
@@ -561 +561 @@
  *@@added V0.9.12 (2001-05-18) [umoeller]
  *@@changed V0.9.12 (2001-05-19) [umoeller]: added extended BLDLEVEL support
- *@@changed V0.9.21 (2002-08-18) [umoeller]: added support for IBM TCP/IP format
- *@@changed V0.9.21 (2002-08-18) [umoeller]: fixed DANIS506 format when an extended field had only one character
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: added support for IBM TCP/IP format
+ *@@changed V1.0.0 (2002-08-18) [umoeller]: fixed DANIS506 format when an extended field had only one character
  */
 
@@ -599 +599 @@
                 {
                     // skip leading and trailing spaces
-                    // V0.9.21 (2002-08-18) [umoeller]
+                    // V1.0.0 (2002-08-18) [umoeller]
                     PCSZ pStartOfDT = p,
                          pEndOfDT = p + 24;
@@ -670 +670 @@
                             {
                                 // if (pNextColon > p + 1)
-                                        // fixed V0.9.21 (2002-08-18) [umoeller]
+                                        // fixed V1.0.0 (2002-08-18) [umoeller]
                                         // this failed on fields like "revision"
                                         // which only had one character
@@ -694 +694 @@
             {
                 // IBM TCP/IP format:
-                // V0.9.21 (2002-08-18) [umoeller]
+                // V1.0.0 (2002-08-18) [umoeller]
 
                 // ##built 09:16:27 Mon Sep 17 2001 -- On AURORA43;0.1@@ TCP/IP for OS/2: INETD

trunk/src/helpers/gpih.c

@@ -481 +481 @@
  *      the bottom left and top right pixels to be drawn.
  *
- *      Note: With V0.9.21, this now modifies prcl to be smaller towards
+ *      Note: With V1.0.0, this now modifies prcl to be smaller towards
  *      the center of the rectangle by usWidth so you can call this several
  *      times with different colors.
@@ -487 +487 @@
  *@@changed V0.9.0 [umoeller]: changed function prototype to have colors specified
  *@@changed V0.9.7 (2000-12-20) [umoeller]: now really using inclusive rectangle...
- *@@changed V0.9.21 (2002-08-24) [umoeller]: renamed, now modifying prcl on output
+ *@@changed V1.0.0 (2002-08-24) [umoeller]: renamed, now modifying prcl on output
  */
 
@@ -534 +534 @@
  *      does not modify prcl.
  *
- *@@added V0.9.21 (2002-08-24) [umoeller]
+ *@@added V1.0.0 (2002-08-24) [umoeller]
  */
 

trunk/src/helpers/lan.c

@@ -39 +39 @@
 #include <os2.h>
 
-#define PURE_32
-#include <neterr.h>
-#include <netcons.h>
-#include <server.h>
+// #define PURE_32
+// #include <neterr.h>
+// #include <netcons.h>
+// #include <server.h>
 
 #include <stdlib.h>
@@ -67 +67 @@
  ********************************************************************/
 
-typedef API32_FUNCTION NET32WKSTAGETINFO(const unsigned char *pszServer,
+#define API32_FUNCTION APIRET APIENTRY
+
+typedef API32_FUNCTION NET32WKSTAGETINFO(PCSZ pszServer,
                                          unsigned long ulLevel,
-                                         unsigned char *pbBuffer,
+                                         PBYTE pbBuffer,
                                          unsigned long ulBuffer,
                                          unsigned long *pulTotalAvail);
 
-typedef API32_FUNCTION NET32SERVERENUM2(const unsigned char *pszServer,
+typedef API32_FUNCTION NET32SERVERENUM2(PCSZ pszServer,
                                         unsigned long ulLevel,
-                                        unsigned char *pbBuffer,
+                                        PBYTE pbBuffer,
                                         unsigned long cbBuffer,
                                         unsigned long *pcEntriesRead,
                                         unsigned long *pcTotalAvail,
                                         unsigned long flServerType,
-                                        unsigned char *pszDomain);
+                                        PBYTE pszDomain);
+
+typedef API32_FUNCTION NET32SERVICESTATUS(PCSZ pbBuffer,
+                                          unsigned long ulBuffer);
+
+typedef API32_FUNCTION NET32SERVICEGETINFO(PCSZ pszServer,
+                                           PCSZ pszService,
+                                           unsigned long ulLevel,
+                                           PBYTE pbBuffer,
+                                           unsigned long ulBuffer,
+                                           unsigned long *pulTotalAvail);
+
+typedef API32_FUNCTION NET32SERVICECONTROL(PCSZ pszServer,
+                                          PCSZ pszService,
+                                          unsigned short usOpcode,
+                                          unsigned short usArg,
+                                          PBYTE pbBuffer,
+                                          unsigned long ulBuffer);
+
+typedef API32_FUNCTION NET32SERVICEINSTALL(PCSZ pszServer,
+                                           PCSZ pszService,
+                                           PCSZ pszCmdArgs,
+                                           PBYTE pbBuffer,
+                                           unsigned long ulBuffer);
 
 /* ******************************************************************
@@ -92 +117 @@
 NET32WKSTAGETINFO *pNet32WkstaGetInfo = NULL;
 NET32SERVERENUM2 *pNet32ServerEnum2 = NULL;
+NET32SERVICESTATUS *pNet32ServiceStatus = NULL;
+NET32SERVICEGETINFO *pNet32ServiceGetInfo = NULL;
+NET32SERVICECONTROL *pNet32ServiceControl = NULL;
+NET32SERVICEINSTALL *pNet32ServiceInstall = NULL;
 
 RESOLVEFUNCTION NetResolves[] =
     {
         "Net32WkstaGetInfo", (PFN*)&pNet32WkstaGetInfo,
-        "Net32ServerEnum2", (PFN*)&pNet32ServerEnum2
+        "Net32ServerEnum2", (PFN*)&pNet32ServerEnum2,
+        "Net32ServiceStatus", (PFN*)&pNet32ServiceStatus,
+        "Net32ServiceGetInfo", (PFN*)&pNet32ServiceGetInfo,
+        "Net32ServiceControl", (PFN*)&pNet32ServiceControl,
+        "Net32ServiceInstall", (PFN*)&pNet32ServiceInstall,
     };
 
@@ -105 +138 @@
 /*
  *@@ lanInit:
- *
+ *      initializes the LAN server interface.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR: functions resolved successfully,
+ *          engine is ready.
+ *
+ *      or the error codes from doshResolveImports.
  */
 
@@ -118 +158 @@
     }
 
-    printf(__FUNCTION__ ": arc %d\n", G_ulNetsResolved);
-
-    return (G_ulNetsResolved);
+    return G_ulNetsResolved;
 }
 
@@ -139 +177 @@
 {
     APIRET arc;
+
     if (!(arc = lanInit()))
     {
@@ -150 +189 @@
             if (!(arc = pNet32ServerEnum2(NULL,
                                           1,          // ulLevel
-                                          (PUCHAR)pBuf,       // pbBuffer
+                                          (PBYTE)pBuf,       // pbBuffer
                                           cb,          // cbBuffer,
                                           &ulEntriesRead, // *pcEntriesRead,
@@ -170 +209 @@
 }
 
+/*
+ *@@ lanServiceGetInfo:
+ *      queries the given service.
+ *
+ *@@added V1.0.0 (2002-09-24) [umoeller]
+ */
+
+APIRET lanServiceGetInfo(PCSZ pcszServiceName,
+                         PSERVICEBUF2 pBuf)
+{
+    APIRET  arc;
+
+    if (!(arc = lanInit()))
+    {
+        ULONG   ulBytesAvail = 0;
+        arc = pNet32ServiceGetInfo(NULL,
+                                   pcszServiceName,
+                                   2,        // level
+                                   (PBYTE)pBuf,
+                                   sizeof(SERVICEBUF2),
+                                   &ulBytesAvail);
+
+    }
+
+    return arc;
+}
+/*
+ *@@ lanServiceInstall:
+ *      starts the given service. The service name
+ *      must be fully qualified so you cannot
+ *      abbreviate "requester" with "req", for
+ *      example (as valid with the net command).
+ *
+ *      Returns, among others:
+ *
+ *      --  NO_ERROR
+ *
+ *      --  NERR_ServiceInstalled (2182): the service
+ *          has already been started.
+ *
+ *      --  NERR_BadServiceName (2185): invalid service
+ *          name.
+ *
+ *@@added V1.0.0 (2002-09-24) [umoeller]
+ */
+
+APIRET lanServiceInstall(PCSZ pcszServiceName,
+                         PSERVICEBUF2 pBuf2)        // out: service data
+{
+    APIRET  arc;
+
+    if (!(arc = lanInit()))
+    {
+        SERVICEBUF2 buf2;
+
+        if (!(arc = pNet32ServiceInstall(NULL,
+                                         pcszServiceName,
+                                         NULL,
+                                         (PBYTE)pBuf2,
+                                         sizeof(SERVICEBUF2))))
+            ;
+    }
+
+    return arc;
+}
+
+/*
+ *@@ lanServiceControl:
+ *      queries, pauses, resumes, or stops the given service.
+ *
+ *      opcode must be one of:
+ *
+ *      --  SERVICE_CTRL_INTERROGATE (0): interrogate service status.
+ *
+ *      --  SERVICE_CTRL_PAUSE (1): pause service.
+ *
+ *      --  SERVICE_CTRL_CONTINUE (2): continue service.
+ *
+ *      --  SERVICE_CTRL_UNINSTALL (3): stop service.
+ *
+ *@@added V1.0.0 (2002-09-24) [umoeller]
+ */
+
+APIRET lanServiceControl(PCSZ pcszServiceName,
+                         ULONG opcode,
+                         PSERVICEBUF2 pBuf2)        // out: service data
+{
+    APIRET  arc;
+
+    if (!(arc = lanInit()))
+    {
+       if (!(arc = pNet32ServiceControl(NULL,
+                                        pcszServiceName,
+                                        opcode,
+                                        0,
+                                        (PBYTE)pBuf2,
+                                        sizeof(SERVICEBUF2))))
+            ;
+
+    }
+
+    return arc;
+}
+
 #ifdef __LAN_TEST__
 

trunk/src/helpers/linklist.c

@@ -262 +262 @@
 
     lstInit(pNewList, fItemsFreeable);
-    return (pNewList);
+
+    return pNewList;
 }
 
@@ -296 +297 @@
     if (pNewList = (PLINKLIST)malloc(sizeof(LINKLIST)))
         lstInit(pNewList, fItemsFreeable);
-    return (pNewList);
+
+    return pNewList;
 }
 
@@ -361 +363 @@
 long lstCountItems(const LINKLIST *pList)
 {
-    long lCount = -1;
-
-    if (pList)
-        if (pList->ulMagic == LINKLISTMAGIC)
-        {
-            lCount = pList->ulCount;
-        }
-
-    return (lCount);
+    if (    (pList)
+         && (pList->ulMagic == LINKLISTMAGIC)
+       )
+        return pList->ulCount;
+
+    return -1;
 }
 
@@ -404 +403 @@
          && (pList->ulMagic == LINKLISTMAGIC)
        )
-        return (pList->pFirst);
-
-    return (0);
+        return pList->pFirst;
+
+    return 0;
 }
 
@@ -422 +421 @@
          && (pList->ulMagic == LINKLISTMAGIC)
        )
-        return (pList->pLast);
-
-    return (0);
+        return pList->pLast;
+
+    return 0;
 }
 
@@ -463 +462 @@
     }
 
-    return (pNode);
+    return pNode;
 }
 
@@ -500 +499 @@
     }
 
-    return (pNodeFound);
+    return pNodeFound;
 }
 
@@ -558 +557 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -616 +615 @@
     }
 
-    return (pNewNode);
+    return pNewNode;
 }
 
@@ -670 +669 @@
     }
 
-    return (pNewNode);
+    return pNewNode;
 }
 
@@ -767 +766 @@
     }
 
-    return (pNewNode);
+    return pNewNode;
 }
 
@@ -830 +829 @@
     }
 
-    return (fFound);
+    return fFound;
 }
 
@@ -855 +854 @@
 
     if (pNode = lstNodeFromItem(pList, pRemoveItem))
-        return (lstRemoveNode(pList, pNode));
-
-    return (FALSE);
+        return lstRemoveNode(pList, pNode);
+
+    return FALSE;
 }
 
@@ -879 +878 @@
         pNode2->pItemData = pTemp;
 
-        return (TRUE);
+        return TRUE;
     }
 
-    return (FALSE);
+    return FALSE;
 }
 
@@ -1085 +1084 @@
                   void* pNewItemData)     // in: data to store in list node
 {
-    return (lstAppendItem(pList, pNewItemData));
+    return lstAppendItem(pList, pNewItemData);
 }
 
@@ -1115 +1114 @@
 PLISTNODE lstPop(PLINKLIST pList)
 {
-    return (pList->pLast);
-}
-
-
+    return pList->pLast;
+}
+
+

trunk/src/helpers/map_vac.c

@@ -8 +8 @@
  *            numbering.
  *
- *@@added V0.9.21 (2002-09-13) [umoeller]
+ *@@added V1.0.0 (2002-09-13) [umoeller]
  *
  *@@header "helpers\mapfile.h"

trunk/src/helpers/prfh2.c

@@ -42 +42 @@
 #define INCL_DOSERRORS
 #define INCL_WINSHELLDATA
+#define INCL_WINERRORS
 #include <os2.h>
 
@@ -54 +55 @@
 
 #include "helpers\prfh.h"
+#include "helpers\xprf.h"
 
 #pragma hdrstop
@@ -641 +643 @@
 }
 
-
+#ifdef __PRFH2_MAIN__
+
+int main(int argc, char* argv[])
+{
+    APIRET  arc = NO_ERROR;
+    PCSZ    pcszSource,
+            pcszTarget,
+            pcszApp;
+    PXINI   piniSource;
+    HINI    hiniTarget;
+    BOOL    fCloseSource = FALSE,
+            fCloseTarget = FALSE;
+    HAB     hab = WinInitialize(0);
+    CHAR    szFailing[1000];
+
+    if (argc < 4)
+    {
+        printf("%d\nprfh2 <sourcefile> <targetfile> <appname>\n", argc);
+        exit(2);
+    }
+
+    pcszSource = argv[1];
+    pcszTarget = argv[2];
+    pcszApp = argv[3];
+
+    if (arc = xprfOpenProfile(pcszSource,
+                              &piniSource))
+    {
+        printf("xprfOpenProfile returned %d opening source INI \"%s\"\n",
+               arc,
+               pcszSource);
+    }
+    else
+        fCloseSource = TRUE;
+
+    if (!strcmp(pcszTarget, "USER"))
+        hiniTarget = HINI_USER;
+    else if (!strcmp(pcszTarget, "SYSTEM"))
+        hiniTarget = HINI_SYSTEM;
+    else
+    {
+        if (!(hiniTarget = PrfOpenProfile(hab, (PSZ)pcszTarget)))
+        {
+            printf("Cannot open source INI \"%s\"\n", pcszTarget);
+            arc = -1;
+        }
+        else
+            fCloseTarget = TRUE;
+    }
+
+    if (!arc)
+    {
+        if (arc = xprfCopyApp2(piniSource,
+                               pcszApp,
+                               hiniTarget,
+                               pcszApp,
+                               szFailing))
+        {
+            printf("Error %d copying application \"%s\" from %s to %s\n",
+                   arc,
+                   pcszApp,
+                   pcszSource,
+                   pcszTarget);
+            printf("Failing key: \"%s\"\n",
+                   szFailing);
+        }
+        else
+            printf("Application \"%s\" successfully copied from %s to %s\n",
+                   pcszApp,
+                   pcszSource,
+                   pcszTarget);
+    }
+
+    if (arc)
+    {
+        ERRORID eid;
+        eid = WinGetLastError(hab);
+
+        printf("WinGetLastError returned 0x%lX\n",
+               eid);
+    }
+
+
+    if (fCloseSource)
+        xprfCloseProfile(piniSource);
+    if (fCloseTarget)
+        PrfCloseProfile(hiniTarget);
+
+    WinTerminate(hab);
+
+    exit(arc);
+}
+
+#endif

trunk/src/helpers/procstat.c

@@ -558 +558 @@
  *
  *@@added V0.9.2 (2000-03-05) [umoeller]
- *@@changed V0.9.21 (2002-08-16) [pr]: optimized
+ *@@changed V1.0.0 (2002-08-16) [pr]: optimized
  */
 
@@ -602 +602 @@
  *@@ prc32FindProcessFromPID:
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
- *@@changed V0.9.21 (2002-08-16) [pr]: optimized
+ *@@added V1.0.0 (2002-08-12) [umoeller]
+ *@@changed V1.0.0 (2002-08-16) [pr]: optimized
  */
 

trunk/src/helpers/textview.c

@@ -2319 +2319 @@
  *      implementation for WM_CREATE in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2465 +2465 @@
  *      implementation for WM_PAINT in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2559 +2559 @@
  *      implementation for WM_PRESPARAMCHANGED in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2589 +2589 @@
  *      implementation for WM_SETFOCUS in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2652 +2652 @@
  *      implementation for WM_BUTTON1DOWN in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2724 +2724 @@
  *      implementation for WM_BUTTON1UP in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2766 +2766 @@
  *      implementation for WM_CHAR in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2889 +2889 @@
  *      implementation for TXM_JUMPTOANCHORNAME in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -2945 +2945 @@
  *      implementation for WM_DESTROY in fnwpTextView.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -3019 +3019 @@
  *@@changed V0.9.20 (2002-08-10) [umoeller]: added support for XS_STATIC
  *@@changed V0.9.20 (2002-08-10) [umoeller]: added support for formatting HTML and plain text automatically
- *@@changed V0.9.21 (2002-08-12) [umoeller]: optimized locality by moving big chunks into subfuncs
+ *@@changed V1.0.0 (2002-08-12) [umoeller]: optimized locality by moving big chunks into subfuncs
  */
 
@@ -3036 +3036 @@
         case WM_CREATE:
             mrc = ProcessCreate(hwndTextView, mp1, mp2);
-                    // extracted V0.9.21 (2002-08-12) [umoeller]
+                    // extracted V1.0.0 (2002-08-12) [umoeller]
         break;
 
@@ -3090 +3090 @@
         case WM_PAINT:
             ProcessPaint(hwndTextView);
-                    // extracted V0.9.21 (2002-08-12) [umoeller]
+                    // extracted V1.0.0 (2002-08-12) [umoeller]
         break;
 
@@ -3362 +3362 @@
          *      a ULONG.
          *
-         *@@changed V0.9.21 (2002-08-12) [umoeller]: now returning bytes
+         *@@changed V1.0.0 (2002-08-12) [umoeller]: now returning bytes
          */
 

trunk/src/helpers/threads.c

@@ -123 +123 @@
  *@@added V0.9.2 (2000-03-05) [umoeller]
  *@@changed V0.9.7 (2000-12-18) [lafaix]: THRF_TRANSIENT support added
- *@@changed V0.9.21 (2002-08-21) [umoeller]: added WinCancelShutdown to avoid shutdown hangs
+ *@@changed V1.0.0 (2002-08-21) [umoeller]: added WinCancelShutdown to avoid shutdown hangs
  */
 
@@ -151 +151 @@
                     // in XWPDAEMN and causes the default OS/2
                     // shutdown to hang
-                    // V0.9.21 (2002-08-21) [umoeller]
+                    // V1.0.0 (2002-08-21) [umoeller]
                     WinCancelShutdown(pti->hmq, TRUE);
 

trunk/src/helpers/winh.c

@@ -580 +580 @@
  *      IDs.
  *
- *@@added V0.9.21 (2002-08-12) [umoeller]
+ *@@added V1.0.0 (2002-08-12) [umoeller]
  */
 
@@ -909 +909 @@
  *      after calling this function.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -2769 +2769 @@
  *
  *@@added V0.9.19 (2002-04-17) [umoeller]
- *@@changed V0.9.21 (2002-08-26) [umoeller]: fixed cx and cy confusion
+ *@@changed V1.0.0 (2002-08-26) [umoeller]: fixed cx and cy confusion
  */
 
@@ -2804 +2804 @@
 
         // if (xNew + swpThis.cy > WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
-                // not cy, but cx V0.9.21 (2002-08-26) [umoeller]
+                // not cy, but cx V1.0.0 (2002-08-26) [umoeller]
         if (xNew + swpThis.cx > WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
         {
@@ -4056 +4056 @@
  *
  *@@added V0.9.9 (2001-03-13) [umoeller]
- *@@changed V0.9.21 (2002-08-26) [umoeller]: added separate hwndOwner
+ *@@changed V1.0.0 (2002-08-26) [umoeller]: added separate hwndOwner
  */
 
@@ -4758 +4758 @@
  *      replacing the current clipboard contents.
  *
- *@@added V0.9.21 (2002-08-28) [umoeller]
+ *@@added V1.0.0 (2002-08-28) [umoeller]
  */
 
@@ -4813 +4813 @@
  *      (XWorkplace status bars).
  *
- *@@added V0.9.21 (2002-08-28) [umoeller]
+ *@@added V1.0.0 (2002-08-28) [umoeller]
  */
 

trunk/src/helpers/xml.c

@@ -3103 +3103 @@
  *@@ ESCAPES:
  *
- *@@added V0.9.21 (2002-08-21) [umoeller]
+ *@@added V1.0.0 (2002-08-21) [umoeller]
  */
 
@@ -3124 +3124 @@
  *@@ DoEscapes:
  *
- *@@added V0.9.21 (2002-08-21) [umoeller]
+ *@@added V1.0.0 (2002-08-21) [umoeller]
  */
 
@@ -3185 +3185 @@
  *
  *@@added V0.9.12 (2001-05-21) [umoeller]
- *@@changed V0.9.21 (2002-08-21) [umoeller]: changed prototype, fixed unescaped characters in attributes and content
+ *@@changed V1.0.0 (2002-08-21) [umoeller]: changed prototype, fixed unescaped characters in attributes and content
  */
 
@@ -3227 +3227 @@
                     // copy attribute value to temp buffer first
                     // so we can escape quotes and ampersands
-                    // V0.9.21 (2002-08-21) [umoeller]
+                    // V1.0.0 (2002-08-21) [umoeller]
                     xstrcpys(&pEscapes->strTemp, pAttribNode->pstrNodeValue);
 
@@ -3270 +3270 @@
                          pChildNode->pstrNodeValue);
 
-                DoEscapes(pEscapes,         // V0.9.21 (2002-08-21) [umoeller]
+                DoEscapes(pEscapes,         // V1.0.0 (2002-08-21) [umoeller]
                           FALSE);           // quotes not
 

trunk/src/helpers/xprf.c

@@ -155 +155 @@
  *
  *      Private helper.
- */
-
-STATIC PXINIAPPDATA FindApp(PXINI pXIni,           // in: profile opened with xprfOpenProfile
-                            const char *pcszApp)
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET FindApp(PXINI pXIni,           // in: profile opened with xprfOpenProfile
+                      const char *pcszApp,
+                      PXINIAPPDATA *ppAppData)
 {
     PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
@@ -165 +168 @@
         PXINIAPPDATA pAppDataThis = (PXINIAPPDATA)pAppNode->pItemData;
         if (!strcmp(pAppDataThis->pszAppName, pcszApp))
-            return (pAppDataThis);
+        {
+            *ppAppData = pAppDataThis;
+            return NO_ERROR;
+        }
 
         pAppNode = pAppNode->pNext;
     }
 
-    return NULL;
+    return PRFERR_INVALID_APP_NAME;
 }
 
@@ -181 +187 @@
  *
  *      Private helper.
- */
-
-STATIC PXINIAPPDATA CreateApp(PXINI pXIni,         // in: profile opened with xprfOpenProfile
-                              const char *pcszApp)
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET CreateApp(PXINI pXIni,         // in: profile opened with xprfOpenProfile
+                        const char *pcszApp,
+                        PXINIAPPDATA *ppAppData)
 {
     PXINIAPPDATA pAppData;
@@ -195 +204 @@
         // store in INI's apps list
         lstAppendItem(&pXIni->llApps, pAppData);
-        pXIni->cApps++;
-    }
-
-    return (pAppData);
+
+        *ppAppData = pAppData;
+        return NO_ERROR;
+    }
+
+    return ERROR_NOT_ENOUGH_MEMORY;
 }
 
@@ -208 +219 @@
  *
  *      Private helper.
- */
-
-STATIC PXINIKEYDATA FindKey(PXINIAPPDATA pAppData,
-                            const char *pcszKey)
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET FindKey(PXINIAPPDATA pAppData,
+                      const char *pcszKey,
+                      PXINIKEYDATA *ppKeyData)
 {
     PLISTNODE pKeyNode = lstQueryFirstNode(&pAppData->llKeys);
@@ -218 +232 @@
         PXINIKEYDATA pKeyDataThis = (PXINIKEYDATA)pKeyNode->pItemData;
         if (!strcmp(pKeyDataThis->pszKeyName, pcszKey))
-            return (pKeyDataThis);
+        {
+            *ppKeyData = pKeyDataThis;
+            return NO_ERROR;
+        }
 
         pKeyNode = pKeyNode->pNext;
     }
 
-    return NULL;
+    return PRFERR_INVALID_KEY_NAME;
 }
 
@@ -234 +251 @@
  *
  *      Private helper.
- */
-
-STATIC PXINIKEYDATA CreateKey(PXINIAPPDATA pAppData,
-                              const char *pcszKey,     // in: key name
-                              PBYTE pbData,            // in: data for key
-                              ULONG cbData)            // in: sizeof (*pbData)
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET CreateKey(PXINIAPPDATA pAppData,
+                        const char *pcszKey,        // in: key name
+                        PBYTE pbData,               // in: data for key
+                        ULONG cbData,               // in: sizeof (*pbData)
+                        PXINIKEYDATA *ppKeyData)    // out: new key data
 {
     PXINIKEYDATA pKeyData;
@@ -253 +273 @@
             lstAppendItem(&pAppData->llKeys, pKeyData);
             pAppData->cKeys++;
+
+            *ppKeyData = pKeyData;
+            return NO_ERROR;
         }
         else
-        {
             // malloc failed:
             free(pKeyData);
-            pKeyData = 0;
-        }
-    }
-
-    return (pKeyData);
+    }
+
+    return ERROR_NOT_ENOUGH_MEMORY;
 }
 
@@ -284 +304 @@
 
 /*
+ *@@ FreeKeyIfExists:
+ *
+ *@@added V1.0.0 (2002-09-17) [umoeller]
+ */
+
+STATIC VOID FreeKeyIfExists(PXINI pXIni,         // in: profile opened with xprfOpenProfile
+                            PXINIAPPDATA pAppData,
+                            PCSZ pcszKey)
+{
+    // find key
+    PXINIKEYDATA pKeyData;
+
+    if (!FindKey(pAppData,
+                 pcszKey,
+                 &pKeyData))
+    {
+        // key exists: kill that
+        FreeKey(pKeyData);
+        // and remove from app's keys list
+        lstRemoveItem(&pAppData->llKeys, pKeyData);
+        pAppData->cKeys--;
+
+        // rewrite profile on close
+        pXIni->fDirty = TRUE;
+    }
+    // else key doesn't exist:
+    // nothing to do
+}
+
+/*
  * FreeApp:
  *      frees the specified application. Does not remove
@@ -319 +369 @@
  */
 
-STATIC BOOL FreeINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
-{
-    BOOL brc = FALSE;
-
+STATIC VOID FreeINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
+{
     if (pXIni)
     {
@@ -338 +386 @@
         free(pXIni);
     }
-
-    return brc;
 }
 
@@ -354 +400 @@
  *
  *      Private helper.
- */
-
-STATIC BOOL ReadINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
-{
-    BOOL brc = FALSE;
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET ReadINI(PXINI pXIni)      // in: profile opened with xprfOpenProfile
+{
+    APIRET      arc;
     FILESTATUS3 fs3;
 
-    if (DosProtectQueryFileInfo(pXIni->hFile,
-                                FIL_STANDARD,
-                                &fs3,
-                                sizeof(fs3),
-                                pXIni->hLock)
-            == NO_ERROR)
+    if (!(arc = DosQueryFileInfo(pXIni->hFile,
+                                 FIL_STANDARD,
+                                 &fs3,
+                                 sizeof(fs3))))
     {
         PBYTE  pbFileData;
-        if (pbFileData = (PBYTE)malloc(fs3.cbFile))
+        if (!(pbFileData = (PBYTE)malloc(fs3.cbFile)))
+            arc = ERROR_NOT_ENOUGH_MEMORY;
+        else
         {
             ULONG ulSet = 0;
-            APIRET arc = DosProtectSetFilePtr(pXIni->hFile,
-                                              0,
-                                              FILE_BEGIN,
-                                              &ulSet,
-                                              pXIni->hLock);
-            if (    (arc == NO_ERROR)
-                 && (ulSet == 0)
-               )
+
+            if (!(arc = DosSetFilePtr(pXIni->hFile,
+                                      0,
+                                      FILE_BEGIN,
+                                      &ulSet)))
             {
                 ULONG cbRead = 0;
-                arc = DosProtectRead(pXIni->hFile,
-                                     pbFileData,
-                                     fs3.cbFile,
-                                     &cbRead,
-                                     pXIni->hLock);
-                if (    (arc == NO_ERROR)
-                     && (cbRead == fs3.cbFile)
-                   )
+                if (!(arc = DosRead(pXIni->hFile,
+                                    pbFileData,
+                                    fs3.cbFile,
+                                    &cbRead)))
                 {
-                    PINIFILE_HEADER pHeader = (PINIFILE_HEADER)pbFileData;
-                    if (pHeader->magic == 0xFFFFFFFF)
+                    if (cbRead != fs3.cbFile)
+                        arc = ERROR_NO_DATA;
+                    else
                     {
-                        ULONG   ulAppOfs = pHeader->offFirstApp;
-
-                        // it was a valid profile, so return TRUE
-                        brc = TRUE;
-
-                        // create-applications loop
-                        while ((ulAppOfs) && (brc))
+                        PINIFILE_HEADER pHeader = (PINIFILE_HEADER)pbFileData;
+                        if (pHeader->magic == 0xFFFFFFFF)
                         {
-                            // application struct
-                            PINIFILE_APP pApp = (PINIFILE_APP)(pbFileData + ulAppOfs);
-                            ULONG   ulKeysOfs = pApp->offFirstKeyInApp;
-                            PXINIAPPDATA pIniApp
-                                = CreateApp(pXIni,
-                                            (PBYTE)(pbFileData + pApp->offAppName));
-                            if (!pIniApp)
+                            ULONG   ulAppOfs = pHeader->offFirstApp;
+
+                            // create-applications loop
+                            while ((ulAppOfs) && (!arc))
                             {
-                                brc = FALSE;
-                                break;
+                                // application struct
+                                PINIFILE_APP pApp = (PINIFILE_APP)(pbFileData + ulAppOfs);
+                                ULONG   ulKeysOfs = pApp->offFirstKeyInApp;
+                                PXINIAPPDATA pIniApp;
+
+                                if (arc = CreateApp(pXIni,
+                                                    (PBYTE)(pbFileData + pApp->offAppName),
+                                                    &pIniApp))
+                                    break;
+
+                                // create-keys loop
+                                while ((ulKeysOfs) && (!arc))
+                                {
+                                    PINIFILE_KEY pKey = (PINIFILE_KEY)(pbFileData + ulKeysOfs);
+
+                                    PXINIKEYDATA pIniKey;
+
+                                    if (arc = CreateKey(pIniApp,
+                                                        (PSZ)(pbFileData + pKey->offKeyName),
+                                                        (PBYTE)(pbFileData + pKey->offKeyData),
+                                                        pKey->lenKeyData,
+                                                        &pIniKey))
+                                        break;
+
+                                    // next key; can be null
+                                    ulKeysOfs = pKey->offNextKeyInApp;
+                                }
+
+                                // next application; can be null
+                                ulAppOfs = pApp->offNextApp;
                             }
-
-                            // create-keys loop
-                            while ((ulKeysOfs) && (brc))
-                            {
-                                PINIFILE_KEY pKey = (PINIFILE_KEY)(pbFileData + ulKeysOfs);
-
-                                PXINIKEYDATA pIniKey
-                                    = CreateKey(pIniApp,
-                                                (PSZ)(pbFileData + pKey->offKeyName),
-                                                (PBYTE)(pbFileData + pKey->offKeyData),
-                                                pKey->lenKeyData);
-
-                                if (!pIniKey)
-                                {
-                                    brc = FALSE;
-                                    break;
-                                }
-
-                                // next key; can be null
-                                ulKeysOfs = pKey->offNextKeyInApp;
-                            }
-
-                            // next application; can be null
-                            ulAppOfs = pApp->offNextApp;
                         }
                     }
@@ -446 +484 @@
     }
 
-    return brc;
+    return arc;
 }
 
@@ -455 +493 @@
  *
  *      Private helper.
- */
-
-STATIC BOOL WriteINI(PXINI pXIni)      // in: profile opened with xprfOpenProfile
-{
-    BOOL    brc = FALSE;
+ *
+ *@@changed V1.0.0 (2002-09-17) [umoeller]: now returning APIRET
+ */
+
+STATIC APIRET WriteINI(PXINI pXIni)      // in: profile opened with xprfOpenProfile
+{
+    APIRET  arc = NO_ERROR;
     ULONG   ulTotalFileSize = sizeof(INIFILE_HEADER);
     ULONG   ulSet = 0;
@@ -471 +511 @@
     // go thru all apps
     PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
+
     while (pAppNode)
     {
@@ -501 +542 @@
     if (pbData2Write = (PBYTE)malloc(ulTotalFileSize))
     {
-        APIRET arc = NO_ERROR;
-
         // set header in buffer
         PINIFILE_HEADER pHeader = (PINIFILE_HEADER)pbData2Write;
@@ -512 +551 @@
 
         pHeader->magic = 0xFFFFFFFF;
-        if (pXIni->cApps)
+        if (lstCountItems(&pXIni->llApps))
             // we have any applications:
             pHeader->offFirstApp = sizeof(INIFILE_HEADER);
@@ -630 +669 @@
 
         // write out everything
-        if (!(arc = DosProtectSetFilePtr(pXIni->hFile,
-                                         0,
-                                         FILE_BEGIN,
-                                         &ulSet,
-                                         pXIni->hLock)))
+        if (!(arc = DosSetFilePtr(pXIni->hFile,
+                                  0,
+                                  FILE_BEGIN,
+                                  &ulSet)))
         {
             ULONG cbWritten = 0;
-            if (    (!(arc = DosProtectWrite(pXIni->hFile,
-                                             pbData2Write,
-                                             ulTotalFileSize,
-                                             &cbWritten,
-                                             pXIni->hLock)))
-                 && (!(arc = DosProtectSetFileSize(pXIni->hFile,
-                                                   ulTotalFileSize,
-                                                   pXIni->hLock)))
-               )
-                brc = TRUE;
+            if (!(arc = DosWrite(pXIni->hFile,
+                                 pbData2Write,
+                                 ulTotalFileSize,
+                                 &cbWritten)))
+            {
+                if (!(arc = DosSetFileSize(pXIni->hFile,
+                                           ulTotalFileSize)))
+                    ;
+            }
         }
 
@@ -652 +689 @@
     }
 
-    return brc;
+    return arc;
 }
 
@@ -688 +725 @@
     APIRET  arc = NO_ERROR;
     PXINI   pXIni = NULL;
-
-    if (pcszFilename)
-        if (strlen(pcszFilename) < CCHMAXPATH - 1)
-        {
-            HFILE   hFile = NULLHANDLE;
-            ULONG   ulAction = 0;
-            FHLOCK  hLock = 0;
-            arc = DosProtectOpen((PSZ)pcszFilename,
-                                 &hFile,
-                                 &ulAction,
-                                 1024,          // initial size
-                                 FILE_NORMAL,
-                                 OPEN_ACTION_CREATE_IF_NEW
-                                    | OPEN_ACTION_OPEN_IF_EXISTS,
-                                 OPEN_FLAGS_FAIL_ON_ERROR
-                                    | OPEN_FLAGS_NO_CACHE
-                                    | OPEN_FLAGS_SEQUENTIAL
-                                    | OPEN_SHARE_DENYREADWRITE
-                                    | OPEN_ACCESS_READWRITE,
-                                 NULL, // no EAs
-                                 &hLock);
-            if (arc == NO_ERROR)
+    ULONG   ulFilenameLen;
+
+    if (    (!pcszFilename)
+         || (!ppxini)
+       )
+        arc = ERROR_INVALID_PARAMETER;      // V1.0.0 (2002-09-17) [umoeller]
+    else if (!(ulFilenameLen = strlen(pcszFilename)))
+        arc = ERROR_INVALID_PARAMETER;      // V1.0.0 (2002-09-17) [umoeller]
+    else if (ulFilenameLen >= CCHMAXPATH - 1)
+        arc = ERROR_FILENAME_EXCED_RANGE;
+    else
+    {
+        HFILE   hFile = NULLHANDLE;
+        ULONG   ulAction = 0;
+        // FHLOCK  hLock = 0;
+
+        if (!(arc = DosOpen((PSZ)pcszFilename,
+                            &hFile,
+                            &ulAction,
+                            1024,          // initial size
+                            FILE_NORMAL,
+                            OPEN_ACTION_CREATE_IF_NEW
+                               | OPEN_ACTION_OPEN_IF_EXISTS,
+                            OPEN_FLAGS_FAIL_ON_ERROR
+                               | OPEN_FLAGS_SEQUENTIAL
+                               | OPEN_SHARE_DENYREADWRITE
+                               | OPEN_ACCESS_READWRITE,
+                            NULL)))
+        {
+            if (!(pXIni = (PXINI)malloc(sizeof(XINI))))
+                arc = ERROR_NOT_ENOUGH_MEMORY;
+            else
             {
-                pXIni = (PXINI)malloc(sizeof(XINI));
-                if (!pXIni)
-                    arc = ERROR_NOT_ENOUGH_MEMORY;
+                // OK: initialize XINI
+                memset(pXIni, 0, sizeof(XINI));
+                memcpy(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES));
+                memcpy(pXIni->szFilename,
+                       pcszFilename,
+                       ulFilenameLen + 1);
+                pXIni->hFile = hFile;
+                // pXIni->hLock = hLock;
+
+                lstInit(&pXIni->llApps, FALSE);
+
+                if (ulAction == FILE_CREATED)
+                    // file newly created: rewrite on close
+                    pXIni->fDirty = TRUE;
                 else
+                    // file existed: read data
+                    if (arc = ReadINI(pXIni))
+                        // error:
+                        FreeINI(pXIni);
+            }
+
+            if (!arc)
+                *ppxini = pXIni;
+            else
+                DosClose(hFile);
+        }
+    }
+
+    return arc;
+}
+
+/*
+ *@@ xprfQueryProfileSize:
+ *      returns the size of INI data, similarly to
+ *      what PrfQueryProfileSize does.
+ *
+ *      If (pszAppName == NULL), this returns the size of
+ *      the buffer required to hold the enumerated list
+ *      of application names. pszKey is then ignored.
+ *
+ *      Otherwise, if (pszKeyName == NULL), this returns
+ *      the size of the buffer required to hold the
+ *      enumerated list of _key_ names for the given
+ *      application.
+ *
+ *      If both pszAppName and pszKeyName are not NULL, this
+ *      returns the data size of the given key.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ *
+ *@@added V1.0.0 (2002-09-17) [umoeller]
+ */
+
+APIRET xprfQueryProfileSize(PXINI pXIni,          // in: profile opened with xprfOpenProfile
+                            PCSZ pszAppName,      // in: application name or NULL
+                            PCSZ pszKeyName,      // in: key name or NULL
+                            PULONG pulDataLen)    // out: size of requested data
+{
+    APIRET  arc = NO_ERROR;
+    ULONG   ulDataLen = 0;
+
+    if (!pszAppName)
+    {
+        PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
+        while (pAppNode)
+        {
+            PXINIAPPDATA pAppDataThis = (PXINIAPPDATA)pAppNode->pItemData;
+            ulDataLen += strlen(pAppDataThis->pszAppName) + 1;
+            pAppNode = pAppNode->pNext;
+        }
+
+        // extra byte for terminating extra null
+        ++ulDataLen;
+    }
+    else
+    {
+        // app specified:
+        PXINIAPPDATA pAppData;
+
+        if (!(arc = FindApp(pXIni,
+                            pszAppName,
+                            &pAppData)))
+        {
+            // app exists:
+
+            if (!pszKeyName)
+            {
+                // app != NULL, but key == NULL:
+                // return size of keys list
+                PLISTNODE pKeyNode = lstQueryFirstNode(&pAppData->llKeys);
+                while (pKeyNode)
                 {
-                    // OK: initialize XINI
-                    memset(pXIni, 0, sizeof(XINI));
-                    memcpy(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES));
-                    strcpy(pXIni->szFilename, pcszFilename);
-                    pXIni->hFile = hFile;
-                    pXIni->hLock = hLock;
-
-                    lstInit(&pXIni->llApps, FALSE);
-
-                    if (ulAction == FILE_CREATED)
-                        // file newly created: rewrite on close
-                        pXIni->fDirty = TRUE;
+                    PXINIKEYDATA pKeyDataThis = (PXINIKEYDATA)pKeyNode->pItemData;
+                    ulDataLen += strlen(pKeyDataThis->pszKeyName) + 1;
+                    pKeyNode = pKeyNode->pNext;
+                }
+
+                // extra byte for terminating extra null
+                ++ulDataLen;
+            }
+            else
+            {
+                // both app and key specified:
+                PXINIKEYDATA pKeyData;
+                if (!(arc = FindKey(pAppData,
+                                    pszKeyName,
+                                    &pKeyData)))
+                    ulDataLen = pKeyData->cbData;
+            }
+        }
+    }
+
+    if (pulDataLen)
+        *pulDataLen = ulDataLen;
+
+    return arc;
+}
+
+/*
+ *@@ xprfQueryProfileData:
+ *      reads data from the given XINI, similarly to
+ *      what PrfQueryProfileData does.
+ *
+ *      If (pszAppName == NULL), this returns the
+ *      enumerated list of application names.
+ *      pszKey is then ignored. *pulBufferMax
+ *      receives the total size of the list excluding
+ *      the final NULL character.
+ *
+ *      Otherwise, if (pszKeyName == NULL), this the
+ *      enumerated list of _key_ names for the given
+ *      application. *pulBufferMax receives the total
+ *      size of the list excluding the final NULL character.
+ *
+ *      If both pszAppName and pszKeyName are not NULL,
+ *      this returns the data of the given key.
+ *      pulBufferMax receives the bytes copied.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ */
+
+APIRET xprfQueryProfileData(PXINI pXIni,          // in: profile opened with xprfOpenProfile
+                            PCSZ pszAppName,      // in: application name
+                            PCSZ pszKeyName,      // in: key name or NULL
+                            PVOID pBuffer,        // in: buffer to receive data
+                            PULONG pulBufferMax)  // in: buffer size, out: size of written data
+{
+    APIRET  arc = NO_ERROR;
+    ULONG   ulDataLen = 0;
+
+    if (!pszAppName)
+    {
+        PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
+        PBYTE   pbTarget = (PSZ)pBuffer;
+        ULONG   cbCopied = 0;
+        while (pAppNode)
+        {
+            PXINIAPPDATA pAppDataThis = (PXINIAPPDATA)pAppNode->pItemData;
+            ULONG   cbThis = strlen(pAppDataThis->pszAppName) + 1;
+            if (cbCopied + cbThis > *pulBufferMax)
+                break;
+            else
+            {
+                memcpy(pbTarget + cbCopied,
+                       pAppDataThis->pszAppName,
+                       cbThis);
+                cbCopied += cbThis;
+            }
+
+            pAppNode = pAppNode->pNext;
+        }
+
+        // extra byte for terminating extra null
+        pbTarget[cbCopied] = '\0';
+        ulDataLen = cbCopied;       // PMREF says terminating null is not counted
+    }
+    else
+    {
+        // app specified:
+        PXINIAPPDATA pAppData;
+
+        if (!(arc = FindApp(pXIni,
+                            pszAppName,
+                            &pAppData)))
+        {
+            // app exists:
+
+            if (!pszKeyName)
+            {
+                // app != NULL, but key == NULL:
+                // return size of keys list
+                PLISTNODE pKeyNode = lstQueryFirstNode(&pAppData->llKeys);
+                PBYTE   pbTarget = (PSZ)pBuffer;
+                ULONG   cbCopied = 0;
+                while (pKeyNode)
+                {
+                    PXINIKEYDATA pKeyDataThis = (PXINIKEYDATA)pKeyNode->pItemData;
+                    ULONG   cbThis = strlen(pKeyDataThis->pszKeyName) + 1;
+                    if (cbCopied + cbThis > *pulBufferMax)
+                        break;
                     else
-                        // file existed: read data
-                        if (!ReadINI(pXIni))
-                        {
-                            // error:
-                            FreeINI(pXIni);
-                            pXIni = NULL;
-                            arc = PRFERR_READ;
-                        }
-
-                    if ((pXIni) && (ppxini))
-                        *ppxini = pXIni;
+                    {
+                        memcpy(pbTarget + cbCopied,
+                               pKeyDataThis->pszKeyName,
+                               cbThis);
+                        cbCopied += cbThis;
+                    }
+
+                    pKeyNode = pKeyNode->pNext;
+                }
+
+                // extra byte for terminating extra null
+                pbTarget[cbCopied] = '\0';
+                ulDataLen = cbCopied;       // PMREF says terminating null is not counted
+            }
+            else
+            {
+                // both app and key specified:
+                PXINIKEYDATA pKeyData;
+                if (!(arc = FindKey(pAppData,
+                                    pszKeyName,
+                                    &pKeyData)))
+                {
+                    ulDataLen = min(pKeyData->cbData,
+                                    *pulBufferMax);
+                    memcpy(pBuffer,
+                           pKeyData->pbData,
+                           ulDataLen);
                 }
             }
         }
+    }
+
+    if (pulBufferMax)
+        *pulBufferMax = ulDataLen;
 
     return arc;
 }
-
-/*
- *@@ xprfQueryProfileData:
- *      similar to PrfQueryProfileData.
- *
- *      @@todo: Still to be written.
- */
-
-/* BOOL xprfQueryProfileData(PXINI hIni,            // in: profile opened with xprfOpenProfile
-                          const char *pcszApp,
-                          const char *pcszKey,
-                          PVOID pBuffer,
-                          PULONG pulBufferMax)
-{
-    BOOL brc = FALSE;
-
-    return brc;
-} */
 
 /*
@@ -792 +1028 @@
  *      as "dirty" so that the file will be rewritten
  *      on xprfCloseProfile.
- */
-
-BOOL xprfWriteProfileData(PXINI hIni,           // in: profile opened with xprfOpenProfile
-                          const char *pcszApp,  // in: application name
-                          const char *pcszKey,  // in: key name or NULL
-                          PVOID pData,          // in: data to write or NULL
-                          ULONG ulDataLen)      // in: sizeof(*pData) or null
-{
-    BOOL brc = FALSE;
-
-    if (hIni)
-    {
-        PXINI pXIni = (PXINI)hIni;
-        if (memcmp(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES))
-                        == 0)
-        {
-            // check if application exists
-            PXINIAPPDATA pAppData = FindApp(pXIni,
-                                            pcszApp);
-
-            // now check: does caller want entire application deleted?
-            if (!pcszKey)
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ */
+
+APIRET xprfWriteProfileData(PXINI pXIni,          // in: profile opened with xprfOpenProfile
+                            const char *pcszApp,  // in: application name
+                            const char *pcszKey,  // in: key name or NULL
+                            PVOID pData,          // in: data to write or NULL
+                            ULONG ulDataLen)      // in: sizeof(*pData) or null
+{
+    APIRET  arc = NO_ERROR;
+
+    if (    (!pXIni)
+         || (memcmp(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES)))
+       )
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        // check if application exists
+        PXINIAPPDATA pAppData;
+
+        if (FindApp(pXIni,
+                    pcszApp,
+                    &pAppData))
+            // not found:
+            pAppData = NULL;
+
+        // now check: does caller want entire application deleted?
+        if (!pcszKey)
+        {
+            // yes, delete application: did we find it?
+            if (pAppData)
             {
-                // yes, delete application: did we find it?
+                // yes: kill that
+                FreeApp(pAppData);
+                // and remove from list
+                lstRemoveItem(&pXIni->llApps, pAppData);
+
+                // rewrite profile on close
+                pXIni->fDirty = TRUE;
+            }
+            // else application doesn't exist:
+            // nothing to do return NO_ERROR
+        }
+        else
+        {
+            // caller has specified key:
+            // does caller want a key to be deleted?
+            if (!ulDataLen)
+            {
+                // yes: delete key:
                 if (pAppData)
                 {
-                    // yes: kill that
-                    FreeApp(pAppData);
-                    // and remove from list
-                    brc = lstRemoveItem(&pXIni->llApps, pAppData);
-                    pXIni->cApps--;
-                    // rewrite profile on close
-                    pXIni->fDirty = TRUE;
+                    // app exists:
+                    FreeKeyIfExists(pXIni,
+                                    pAppData,
+                                    pcszKey);
                 }
-                else
-                    // application doesn't exist:
-                    brc = TRUE;
+                // else app doesn't even exist:
+                // nothing to do, return NO_ERROR
             }
             else
             {
-                // caller has specified key:
-                // does caller want a key to be deleted?
-                if (!ulDataLen)
+                // key and data specified: let's add something...
+
+                if (!pAppData)
+                    // app doesn't exist yet:
+                    // create
+                    arc = CreateApp(pXIni,
+                                    pcszApp,
+                                    &pAppData);
+
+                if (!arc)
                 {
-                    // yes: delete key:
-                    if (pAppData)
-                    {
-                        // app exists:
-                        // find key
-                        PXINIKEYDATA pKeyData = FindKey(pAppData,
-                                                        pcszKey);
-                        if (pKeyData)
-                        {
-                            // key exists: kill that
-                            FreeKey(pKeyData);
-                            // and remove from app's keys list
-                            brc = lstRemoveItem(&pAppData->llKeys, pKeyData);
-                            pAppData->cKeys--;
-                            // rewrite profile on close
-                            pXIni->fDirty = TRUE;
-                        }
-                        else
-                            // key doesn't even exist:
-                            brc = TRUE;
-                    }
-                    else
-                        // app doesn't even exist:
-                        brc = TRUE;
-                }
-                else
-                {
-                    // key and data specified: let's add something...
-
-                    if (!pAppData)
-                        // app doesn't exist yet:
-                        // create
-                        pAppData = CreateApp(pXIni,
-                                             pcszApp);
-
-                    if (pAppData)
-                    {
-                        // found or created app:
-                        // check if key exists
-                        PXINIKEYDATA pKeyData = FindKey(pAppData,
-                                                        pcszKey);
-                        if (!pKeyData)
-                            // doesn't exist yet:
-                            // create
-                            pKeyData = CreateKey(pAppData,
-                                                 pcszKey,
-                                                 (PBYTE)pData,
-                                                 ulDataLen);
-
-                        if (pKeyData)
-                        {
-                           // mark as dirty
-                           pXIni->fDirty = TRUE;
-                           brc = TRUE;
-                        }
-                    }
+                    // found or created app:
+
+                    // delete existing key if it exists
+                    PXINIKEYDATA pKeyData;
+
+                    FreeKeyIfExists(pXIni,
+                                    pAppData,
+                                    pcszKey);
+
+                    // now create new key
+                    if (!(arc = CreateKey(pAppData,
+                                          pcszKey,
+                                          (PBYTE)pData,
+                                          ulDataLen,
+                                          &pKeyData)))
+                       // mark as dirty
+                       pXIni->fDirty = TRUE;
                 }
             }
@@ -897 +1126 @@
     }
 
-    return brc;
+    return arc;
 }
 
@@ -909 +1138 @@
  *      You cannot specify HINI_SYSTEM or HINI_USER for
  *      hINi.
- */
-
-BOOL xprfCloseProfile(PXINI hIni)       // in: profile opened with xprfOpenProfile
-{
-    BOOL brc = FALSE;
-
-    if (hIni)
-    {
-        PXINI pXIni = (PXINI)hIni;
-        if (memcmp(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES))
-                        == 0)
-        {
-            brc = TRUE;
-
-            if (pXIni->fDirty)
-                brc = WriteINI(pXIni);
-
-            if (brc)
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ */
+
+APIRET xprfCloseProfile(PXINI pXIni)       // in: profile opened with xprfOpenProfile
+{
+    APIRET  arc = NO_ERROR;
+
+    if (    (!pXIni)
+         || (memcmp(pXIni->acMagic, XINI_MAGIC_BYTES, sizeof(XINI_MAGIC_BYTES)))
+       )
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        if (pXIni->fDirty)
+            arc = WriteINI(pXIni);
+
+        if (!arc)
+        {
+            if (!(arc = DosClose(pXIni->hFile)))
             {
-                APIRET arc = DosProtectClose(pXIni->hFile,
-                                             pXIni->hLock);
-                if (arc == NO_ERROR)
-                {
-                    pXIni->hFile = 0;
-                    pXIni->hLock = 0;
-
-                    FreeINI(pXIni);
-                }
-                else
-                    brc = FALSE;
+                pXIni->hFile = 0;
+
+                FreeINI(pXIni);
             }
         }
     }
 
-    return brc;
-}
-
-
+    return arc;
+}
+
+/*
+ *@@ xprfQueryKeysForApp:
+ *      the equivalent of prfhQueryKeysForApp for
+ *      XINI files.
+ *
+ *@@added V1.0.0 (2002-09-17) [umoeller]
+ */
+
+APIRET xprfQueryKeysForApp(PXINI hIni,      // in: INI handle
+                           PCSZ pcszApp,    // in: application to query list for (or NULL for applications list)
+                           PSZ *ppszKeys)   // out: keys list (newly allocated)
+{
+    APIRET  arc = NO_ERROR;
+    PSZ     pKeys = NULL;
+    ULONG   ulSizeOfKeysList = 0;
+
+    // get size of keys list for pszApp
+    if (!xprfQueryProfileSize(hIni, pcszApp, NULL, &ulSizeOfKeysList))
+        arc = PRFERR_KEYSLIST;
+    else
+    {
+        if (ulSizeOfKeysList == 0)
+            ulSizeOfKeysList = 1;    // V0.9.19 (2002-04-11) [pr]
+
+        if (!(pKeys = (PSZ)malloc(ulSizeOfKeysList)))
+            arc = ERROR_NOT_ENOUGH_MEMORY;
+        else
+        {
+            *pKeys = 0;
+            if (!xprfQueryProfileData(hIni, pcszApp, NULL, pKeys, &ulSizeOfKeysList))
+                arc = PRFERR_KEYSLIST;
+        }
+    }
+
+    if (!arc)       // V0.9.12 (2001-05-12) [umoeller]
+        *ppszKeys = pKeys;
+    else
+        if (pKeys)
+            free(pKeys);
+
+    return arc;
+}
+

trunk/src/helpers/xprf2.c

@@ -77 +77 @@
 
 APIRET xprfCopyKey(HINI hiniSource,       // in: source profile (can be HINI_USER or HINI_SYSTEM)
-                   PSZ pszSourceApp,      // in: source application
-                   PSZ pszKey,            // in: source/target key
+                   PCSZ pszSourceApp,     // in: source application
+                   PCSZ pszKey,           // in: source/target key
                    PXINI hiniTarget,      // in: target profile opened with xprfOpenProfile
-                   PSZ pszTargetApp)      // in: target app
+                   PCSZ pszTargetApp)     // in: target app
 {
     ULONG   ulSizeOfData = 0;
     APIRET  arc = NO_ERROR;
 
-    if (PrfQueryProfileSize(hiniSource, pszSourceApp, pszKey, &ulSizeOfData))
+    if (PrfQueryProfileSize(hiniSource,
+                            (PSZ)pszSourceApp,
+                            (PSZ)pszKey,
+                            &ulSizeOfData))
     {
         PSZ pData = 0;
@@ -107 +110 @@
             fflush(stdout);
             if (PrfQueryProfileData(hiniSource,
-                                    pszSourceApp,
-                                    pszKey,
+                                    (PSZ)pszSourceApp,
+                                    (PSZ)pszKey,
                                     pData,
                                     &ulSizeOfData))
             {
-                if (!xprfWriteProfileData(hiniTarget,
-                                          pszTargetApp,
-                                          pszKey,
-                                          pData,
-                                          ulSizeOfData))
+                arc = xprfWriteProfileData(hiniTarget,
+                                           pszTargetApp,
+                                           pszKey,
+                                           pData,
+                                           ulSizeOfData);
+            }
+            else
+                arc = PRFERR_READ;
+
+            free(pData);
+        }
+        else
+            arc = ERROR_NOT_ENOUGH_MEMORY;
+    }
+    else
+        arc = PRFERR_DATASIZE;
+
+    return arc;
+}
+
+/*
+ *@@ xprfCopyKey2:
+ *      copies a single key from an xprf* PXINI to a Prf* HINI.
+ *      hiniSource must therefore have been opened using
+ *      xprfOpenProfile.
+ *
+ *      This returns 0 (NO_ERROR) if copying succeeded. Otherwise either
+ *      an OS/2 error code (ERROR_*) or one of the profile error
+ *      codes defined in prfh.h is returned.
+ *
+ *@@added V1.0.0 (2002-09-17) [umoeller]
+ */
+
+APIRET xprfCopyKey2(PXINI hiniSource,   // in: source profile (can be HINI_USER or HINI_SYSTEM)
+                    PCSZ pszSourceApp,  // in: source application
+                    PCSZ pszKey,        // in: source/target key
+                    HINI hiniTarget,    // in: target profile opened with xprfOpenProfile
+                    PCSZ pszTargetApp)  // in: target app
+{
+    ULONG   ulSizeOfData = 0;
+    APIRET  arc = NO_ERROR;
+
+    if (xprfQueryProfileSize(hiniSource, pszSourceApp, pszKey, &ulSizeOfData))
+    {
+        PSZ pData = 0;
+
+        // copy data
+        if (ulSizeOfData == 0)
+        {
+            // data size == 0: this shouldn't really happen,
+            // but if it does, we'll just create a NULL string.
+            // Users have reported that some INI files seem to
+            // contain those "empty" keys. I don't see how these
+            // can exist, but they seem to...
+            pData = (PSZ)malloc(1);
+            *pData = 0;
+        }
+        else
+            pData = (PSZ)malloc(ulSizeOfData);
+
+        if (pData)
+        {
+            fflush(stdout);
+            if (xprfQueryProfileData(hiniSource,
+                                     pszSourceApp,
+                                     pszKey,
+                                     pData,
+                                     &ulSizeOfData))
+            {
+                if (!PrfWriteProfileData(hiniTarget,
+                                         (PSZ)pszTargetApp,
+                                         (PSZ)pszKey,
+                                         pData,
+                                         ulSizeOfData))
                     arc = PRFERR_WRITE;
             }
@@ -135 +207 @@
 /*
  *@@ xprfCopyApp:
- *      copies a single application from an Prf* HINI to an xprf* PXINI.
+ *      copies a single application from a Prf* HINI to an xprf* PXINI.
  *      hiniTarget must therefore have been opened using
  *      xprfOpenProfile.
@@ -146 +218 @@
  */
 
-APIRET xprfCopyApp(HINI hiniSource,   // in: source profile (can be HINI_USER or HINI_SYSTEM)
-                   PSZ pszSourceApp,  // in: source application
-                   PXINI hiniTarget,  // in: target profile opened with xprfOpenProfile
-                   PSZ pszTargetApp,  // in: name of pszSourceApp in hiniTarget
-                   PSZ pszErrorKey)   // out: failing key in case of error; ptr can be NULL
+APIRET xprfCopyApp(HINI hiniSource,     // in: source profile (can be HINI_USER or HINI_SYSTEM)
+                   PCSZ pszSourceApp,   // in: source application
+                   PXINI hiniTarget,    // in: target profile opened with xprfOpenProfile
+                   PCSZ pszTargetApp,   // in: name of pszSourceApp in hiniTarget
+                   PSZ pszErrorKey)     // out: failing key in case of error; ptr can be NULL
 {
     APIRET arc = NO_ERROR;
@@ -167 +239 @@
         {
             // copy this key
-            arc = xprfCopyKey(hiniSource,
-                              pszSourceApp,
-                              pKey2,
-                              hiniTarget,
-                              pszTargetApp);
-            if (arc)
+            if (arc = xprfCopyKey(hiniSource,
+                                  pszSourceApp,
+                                  pKey2,
+                                  hiniTarget,
+                                  pszTargetApp))
             {
                 // error: copy failing key to buffer
@@ -179 +250 @@
                 break;
             }
+
+            pKey2 += strlen(pKey2)+1;
+        } // end while (*pKey2 != 0)
+
+        free (pszKeysList);
+    }
+    else
+        arc = PRFERR_KEYSLIST;
+
+    return arc;
+}
+
+/*
+ *@@ xprfCopyApp2:
+ *      copies a single application from an xprf* PXINI to a Prf* HINI.
+ *      hiniTarget must therefore have been opened using
+ *      xprfOpenProfile.
+ *
+ *      This calls xprfCopyKey2 for each key in the application.
+ *
+ *      This returns 0 (NO_ERROR) if copying succeeded. Otherwise either
+ *      an OS/2 error code (ERROR_*) or one of the profile error
+ *      codes defined in prfh.h is returned.
+ *
+ *@@added V1.0.0 (2002-09-17) [umoeller]
+ */
+
+APIRET xprfCopyApp2(PXINI hiniSource,   // in: source profile (can be HINI_USER or HINI_SYSTEM)
+                    PCSZ pszSourceApp,  // in: source application
+                    HINI hiniTarget,    // in: target profile opened with xprfOpenProfile
+                    PCSZ pszTargetApp,  // in: name of pszSourceApp in hiniTarget
+                    PSZ pszErrorKey)    // out: failing key in case of error; ptr can be NULL
+{
+    APIRET arc = NO_ERROR;
+    PSZ pszKeysList = NULL;
+
+    if (pszErrorKey)
+        *pszErrorKey = 0;
+
+    if (!(arc = xprfQueryKeysForApp(hiniSource,
+                                    pszSourceApp,
+                                    &pszKeysList)))
+    {
+        PSZ pKey2 = pszKeysList;
+
+        while (*pKey2 != 0)
+        {
+            // copy this key
+            if (arc = xprfCopyKey2(hiniSource,
+                                   pszSourceApp,
+                                   pKey2,
+                                   hiniTarget,
+                                   pszTargetApp))
+            {
+                // error: copy failing key to buffer
+                if (pszErrorKey)
+                    strcpy(pszErrorKey, pKey2);
+                break;
+            }
+
             pKey2 += strlen(pKey2)+1;
         } // end while (*pKey2 != 0)
@@ -208 +339 @@
 
 APIRET xprfCopyProfile(HINI hOld,           // in: source profile (can be HINI_USER or HINI_SYSTEM)
-                       PSZ pszNew,          // in: new filename (can be fully qualified)
+                       PCSZ pszNew,         // in: new filename (can be fully qualified)
                        PFN_PRF_PROGRESS pfnProgressCallback,
                        ULONG ulUser,        // in: passed to pfnProgressCallback
                        ULONG ulCount,       // in: index of INI being copied (0 <= ulCount <= ulMax)
-                       ULONG ulMax)         // in: maximum index (for progress); 0 means 1 INI, 1 means 2 INIs, ...
+                       ULONG ulMax,         // in: maximum index (for progress); 0 means 1 INI, 1 means 2 INIs, ...
+                       PSZ pszFailingApp)   // out: failing app on error
 {
     APIRET  arc = NO_ERROR;
@@ -218 +350 @@
     ULONG   ulSizeOfAppsList;
 
+    if (pszFailingApp)
+        *pszFailingApp = 0;
+
     if (!pszNew)
         arc = ERROR_INVALID_PARAMETER;
     else
     {
-        DosDelete(pszNew);
+        DosDelete((PSZ)pszNew);
 
         // open new profile
-        arc = xprfOpenProfile(pszNew,
-                              &pxiniNew);
-
-        // get size of applications list
-        if (arc == NO_ERROR)
-        {
+        if (!(arc = xprfOpenProfile(pszNew,
+                                    &pxiniNew)))
+        {
+            // get size of applications list
             if (!PrfQueryProfileSize(hOld, NULL, NULL, &ulSizeOfAppsList))
                 arc = PRFERR_APPSLIST;
@@ -256 +389 @@
                 {
                     CHAR szErrorKey[1000];
+
                     // copy application (this will call prfhCopyKey in turn)
-                    arc = xprfCopyApp(hOld,
-                                      pApp2,
-                                      pxiniNew,
-                                      pApp2,
-                                      szErrorKey);
-
-                    if (pfnProgressCallback)
+                    if (arc = xprfCopyApp(hOld,
+                                          pApp2,
+                                          pxiniNew,
+                                          pApp2,
+                                          szErrorKey))
+                    {
+                        if (pszFailingApp)
+                            strhncpy0(pszFailingApp, pApp2, CCHMAXPATH);
+                    }
+                    else if (pfnProgressCallback)
                     {
                         ULONG ulNow2, ulMax2;
@@ -325 +462 @@
 APIRET xprfSaveINIs(HAB hab,               // in:  anchor block
                     PFN_PRF_PROGRESS pfnProgressCallback,
-                    ULONG ulUser)
+                    ULONG ulUser,
+                    PSZ pszFailingINI,
+                    PSZ pszFailingApp,
+                    PSZ pszFailingKey)
 {
     PRFPROFILE Profiles;
@@ -400 +540 @@
 
         if (arc == NO_ERROR)
+        {
+            if (pszFailingINI)
+                strcpy(pszFailingINI,
+                       szSysNew);
+
             arc = xprfCopyProfile(HINI_SYSTEM,
                                   szSysNew,              // new filename
                                   pfnProgressCallback,
-                                  ulUser, 0, 1);
+                                  ulUser,
+                                  0,
+                                  1,
+                                  pszFailingApp);
+        }
+
         /*
          * create OS2SYS.XFL:
@@ -410 +560 @@
 
         if (arc == NO_ERROR)
+        {
+            if (pszFailingINI)
+                strcpy(pszFailingINI,
+                       szUserNew);
+
             arc = xprfCopyProfile(HINI_USER,
                                   szUserNew,              // new filename
                                   pfnProgressCallback,
-                                  ulUser, 1, 1);
+                                  ulUser,
+                                  1,
+                                  1,
+                                  pszFailingApp);
+        }
     }
 
@@ -453 +612 @@
     {
         // finally, replace system profiles
-        arc = DosMove(szSysNew, Profiles.pszSysName);
-        if (arc == NO_ERROR)
-            arc = DosMove(szUserNew, Profiles.pszUserName);
+        if (!(arc = DosMove(szSysNew, Profiles.pszSysName)))
+        {
+            if (arc = DosMove(szUserNew, Profiles.pszUserName))
+            {
+                if (pszFailingINI)
+                    strcpy(pszFailingINI,
+                           szUserNew);
+            }
+        }
+        else
+        {
+            if (pszFailingINI)
+                strcpy(pszFailingINI,
+                       szSysNew);
+        }
     }
 
@@ -468 +639 @@
 // testing
 
-/* BOOL _Optlink fnCallback(ULONG ulUser, ULONG ulNow, ULONG ulMax)
+#ifdef __BUILD_XPRF2_MAIN__
+
+BOOL _Optlink fnCallback(ULONG ulUser, ULONG ulNow, ULONG ulMax)
 {
     printf("\r done %03d%%", ulNow * 100 / ulMax);
@@ -476 +649 @@
 int main(int argc, char* argv[])
 {
-    if (argc != 3)
-        printf("Syntax: xprf2 <source.ini> <target.ini>\n");
-    else
-    {
-        HAB hab = WinInitialize(0);
-
-        // HINI hiniSource = PrfOpenProfile(hab, argv[1]);
-        // if (hiniSource)
-        {
-            APIRET arc = xprfCopyProfile(hiniSource,
-                                         argv[2],
-                                         fnCallback,
-                                         0, 0, 0);
-            xprfSaveProfiles(hab, NULL, 0);
-//             if (arc)
-
-
-   //              printf("xprfCopyProfile returned %d.\n", arc);
-        }
-        // else
-            // printf("Cannot open %s\n", argv[1]);
-
-        WinTerminate(hab);
-    }
-
-    return (0);
-} */
-
+    APIRET  arc = 2;
+
+    HAB     hab = WinInitialize(0);
+
+    CHAR    szFailingINI[CCHMAXPATH] = "",
+            szFailingApp[CCHMAXPATH] = "",
+            szFailingKey[CCHMAXPATH] = "";
+
+    arc = xprfSaveINIs(hab,
+                       NULL,
+                       0,
+                       szFailingINI,
+                       szFailingApp,
+                       szFailingKey);
+
+    printf("xprfCopyProfile returned %d ('%s', '%s', '%s'.\n",
+           arc,
+           szFailingINI,
+           szFailingApp,
+           szFailingKey);
+
+    WinTerminate(hab);
+
+    return arc;
+}
+
+#endif
+