Changeset 371 for trunk/src/helpers/xprf.c

Timestamp:

Nov 7, 2008, 1:15:15 AM (17 years ago)

Author:

pr

Message:

Add missing xprf() functions. Fix broken ones also.

File:

• trunk/src/helpers/xprf.c (modified) (17 diffs)

trunk/src/helpers/xprf.c

@@ -74 +74 @@
 
 /*
- *      Copyright (C) 2000 Ulrich M”ller.
+ *      Copyright (C) 2000-2008 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -720 +720 @@
  */
 
-APIRET xprfOpenProfile(const char *pcszFilename,    // in: profile name
-                       PXINI *ppxini)               // out: profile handle
+APIRET xprfOpenProfile(PCSZ pcszFilename,    // in: profile name
+                       PXINI *ppxini)        // out: profile handle
 {
     APIRET  arc = NO_ERROR;
@@ -814 +814 @@
 
 APIRET xprfQueryProfileSize(PXINI pXIni,          // in: profile opened with xprfOpenProfile
-                            PCSZ pszAppName,      // in: application name or NULL
-                            PCSZ pszKeyName,      // in: key name or NULL
+                            PCSZ pcszAppName,     // in: application name or NULL
+                            PCSZ pcszKeyName,     // in: key name or NULL
                             PULONG pulDataLen)    // out: size of requested data
 {
@@ -821 +821 @@
     ULONG   ulDataLen = 0;
 
-    if (!pszAppName)
+    if (!pcszAppName)
     {
         PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
@@ -840 +840 @@
 
         if (!(arc = FindApp(pXIni,
-                            pszAppName,
+                            pcszAppName,
                             &pAppData)))
         {
             // app exists:
 
-            if (!pszKeyName)
+            if (!pcszKeyName)
             {
                 // app != NULL, but key == NULL:
@@ -865 +865 @@
                 PXINIKEYDATA pKeyData;
                 if (!(arc = FindKey(pAppData,
-                                    pszKeyName,
+                                    pcszKeyName,
                                     &pKeyData)))
                     ulDataLen = pKeyData->cbData;
@@ -904 +904 @@
 
 APIRET xprfQueryProfileData(PXINI pXIni,          // in: profile opened with xprfOpenProfile
-                            PCSZ pszAppName,      // in: application name
-                            PCSZ pszKeyName,      // in: key name or NULL
+                            PCSZ pcszAppName,     // in: application name
+                            PCSZ pcszKeyName,     // in: key name or NULL
                             PVOID pBuffer,        // in: buffer to receive data
                             PULONG pulBufferMax)  // in: buffer size, out: size of written data
@@ -912 +912 @@
     ULONG   ulDataLen = 0;
 
-    if (!pszAppName)
+    if (!pcszAppName)
     {
         PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
@@ -944 +944 @@
 
         if (!(arc = FindApp(pXIni,
-                            pszAppName,
+                            pcszAppName,
                             &pAppData)))
         {
             // app exists:
 
-            if (!pszKeyName)
+            if (!pcszKeyName)
             {
                 // app != NULL, but key == NULL:
@@ -982 +982 @@
                 PXINIKEYDATA pKeyData;
                 if (!(arc = FindKey(pAppData,
-                                    pszKeyName,
+                                    pcszKeyName,
                                     &pKeyData)))
                 {
@@ -1002 +1002 @@
 
 /*
+ *@@ xprfQueryProfileInt:
+ *      reads data from the given XINI, similarly to
+ *      what PrfQueryProfileInt does.
+ *
+ *      You cannot specify HINI_SYSTEM or HINI_USER for
+ *      hINi.
+ *
+ *@@added WarpIN V1.0.18 (2008-10-04) [pr]
+ */
+
+LONG xprfQueryProfileInt(PXINI pXIni,
+                         PCSZ pcszApp,
+                         PCSZ pcszKey,
+                         LONG lDefault)
+{
+    char szBuffer[20];
+    LONG lVal = lDefault;
+    ULONG ulSize = sizeof(szBuffer) - 1;
+
+    if (pcszApp && pcszApp[0] && pcszKey && pcszKey[0] &&
+        !xprfQueryProfileData(pXIni, pcszApp, pcszKey, szBuffer, &ulSize))
+    {
+        szBuffer[ulSize] = '\0';
+        lVal = atol(szBuffer);
+    }
+
+    return lVal;
+}
+
+/*
  *@@ xprfWriteProfileData:
  *      writes data into an extended profile (XINI).
@@ -1035 +1065 @@
 
 APIRET xprfWriteProfileData(PXINI pXIni,          // in: profile opened with xprfOpenProfile
-                            const char *pcszApp,  // in: application name
-                            const char *pcszKey,  // in: key name or NULL
+                            PCSZ pcszApp,         // in: application name
+                            PCSZ pcszKey,         // in: key name or NULL
                             PVOID pData,          // in: data to write or NULL
                             ULONG ulDataLen)      // in: sizeof(*pData) or null
@@ -1130 +1160 @@
 
 /*
+ *@@ xprfWriteProfileString:
+ *      writes string into an extended profile (XINI).
+ *      This operates similar to PrfWriteProfileString.
+ *
+ *      You cannot specify HINI_SYSTEM or HINI_USER for
+ *      hINi.
+ *
+ *@@added WarpIN V1.0.18 (2008-10-04) [pr]
+ */
+
+APIRET xprfWriteProfileString(PXINI pXIni,          // in: profile opened with xprfOpenProfile
+                              PCSZ pcszApp,         // in: application name
+                              PCSZ pcszKey,         // in: key name or NULL
+                              PCSZ pcszString)      // in: string to write or NULL
+{
+    ULONG ulDataLen = 0;
+
+    if (pcszString)
+        ulDataLen = strlen(pcszString) + 1;
+
+    return xprfWriteProfileData(pXIni, pcszApp, pcszKey, (PVOID) pcszString, ulDataLen);
+}
+
+/*
  *@@ xprfCloseProfile:
  *      closes a profile opened with xprfOpenProfile.
@@ -1177 +1231 @@
  *
  *@@added V1.0.0 (2002-09-17) [umoeller]
+ *@@changed WarpIN V1.0.18 (2008-10-04) [pr]: fixed inverted logic bugs
  */
 
@@ -1188 +1243 @@
 
     // get size of keys list for pszApp
-    if (!xprfQueryProfileSize(hIni, pcszApp, NULL, &ulSizeOfKeysList))
+    if (xprfQueryProfileSize(hIni, pcszApp, NULL, &ulSizeOfKeysList))
         arc = PRFERR_KEYSLIST;
     else
@@ -1200 +1255 @@
         {
             *pKeys = 0;
-            if (!xprfQueryProfileData(hIni, pcszApp, NULL, pKeys, &ulSizeOfKeysList))
+            if (xprfQueryProfileData(hIni, pcszApp, NULL, pKeys, &ulSizeOfKeysList))
                 arc = PRFERR_KEYSLIST;
         }
@@ -1214 +1269 @@
 }
 
+/*
+ *@@ xprfhQueryProfileData:
+ *      the equivalent of prfhQueryProfileData for
+ *      XINI files.
+ *
+ *@@added WarpIN V1.0.18 (2008-10-04) [pr]
+ */
+
+PSZ xprfhQueryProfileData(PXINI pXIni,           // in: INI handle
+                          PCSZ pcszApp,          // in: application to query
+                          PCSZ pcszKey,          // in: key to query
+                          PULONG pcbBuf)         // out: size of the returned buffer; ptr can be NULL
+{
+    PSZ     pData = NULL;
+    ULONG   ulSizeOfData;
+
+    // get size of data for pcszApp/pcszKey
+    if (    (!xprfQueryProfileSize(pXIni, (PSZ)pcszApp, (PSZ)pcszKey, &ulSizeOfData))
+         && (ulSizeOfData)
+         && (pData = (PSZ)malloc(ulSizeOfData))
+       )
+    {
+        if (xprfQueryProfileData(pXIni, (PSZ)pcszApp, (PSZ)pcszKey, pData, &ulSizeOfData))
+        {
+            free(pData);
+            pData = NULL;
+        }
+    }
+
+    if (pcbBuf)
+        *pcbBuf = ulSizeOfData;
+
+    return pData;
+}
+