Changeset 2776 for trunk/tools/database/StateUpd.cpp

Timestamp:

Feb 14, 2000, 6:18:31 PM (26 years ago)

Author:

bird

Message:

Bugfixes. Nearly there now!

File:

• trunk/tools/database/StateUpd.cpp (modified) (12 diffs)

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.12 2000-02-14 13:49:13 bird Exp $
+/* $Id: StateUpd.cpp,v 1.13 2000-02-14 17:18:31 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -70 +70 @@
     unsigned long  ulRc = 0;
     char           szDLLName[64];
-    OPTIONS        options = {TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, &szDLLName[0], -1};
+    OPTIONS        options = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, &szDLLName[0], -1};
     unsigned long  ulRc2;
     char          *pszErrorDesc = NULL;
@@ -233 +233 @@
 
         /* check db integrity */
-        if (options.fIntegrityBefore)
+        if (options.fIntegrityBefore || options.fIntegrityOnly)
         {
             pszErrorDesc = (char*)malloc(1048768); assert(pszErrorDesc != NULL);
@@ -331 +331 @@
            "\n"
            "    -h or -?      Syntax help. (this)\n"
-           "    -ib<[+]|->    Integrity check at start.     default: enabled\n"
-           "    -ie<[+]|->    Integrity check at end.       default: enabled\n"
+           "    -ib<[+]|->    Integrity check at start.     default: disabled\n"
+           "    -ie<[+]|->    Integrity check at end.       default: disabled\n"
            "    -io           Integrity check only.         default: disabled\n"
            "    -s            Scan subdirectories.          default: disabled\n"
@@ -918 +918 @@
         if (strlen(pszEnd) > 128)
         {
-            fprintf(phSignal,"Fatal error! return statement is too larget. len=%d", strlen(pszEnd));
-            fprintf(phLog,   "Fatal error! return statement is too larget. len=%d", strlen(pszEnd));
-            fprintf(stderr,  "Fatal error! return statement is too larget. len=%d", strlen(pszEnd));
+            /* FIXME LATER! Some constructors calling baseclass constructors "breaks" this rule. Win32MDIChildWindow in /src/user32/win32wmdichild.cpp for example. */
+            fprintf(phSignal,"Fatal error? return statement is too larget. len=%d", strlen(pszEnd));
+            fprintf(phLog,   "Fatal error? return statement is too larget. len=%d", strlen(pszEnd));
+            if (strlen(pszEnd) > 512)
+                fprintf(stderr,  "Fatal error? return statement is too larget. len=%d", strlen(pszEnd));
             fflush(phLog);
             fflush(phSignal);
@@ -930 +932 @@
         *pszEnd = '\0';
 
+        /* !BugFix! some function occur more than once, usually as inline functions */
+        if (pFnDesc->pszReturnType != NULL
+            && strstr(pFnDesc->pszReturnType, "inline ") != NULL)
+        {
+            fprintf(phLog, "Not an API. Inlined functions can't be exported!\n");
+            return 0;
+        }
+
         /* function name */
         if (pFnDesc->pszReturnType != NULL
-            && stristr(pFnDesc->pszReturnType, "cdecl") != NULL)
+            && (stristr(pFnDesc->pszReturnType, "cdecl") != NULL
+                || strstr(pFnDesc->pszReturnType, "VFWAPIV") != NULL
+                || strstr(pFnDesc->pszReturnType, "WINAPIV") != NULL
+                )
+            )
         {   /* cdecl function is prefixed with an '_' */
             strcpy(pszEnd, "_");
@@ -951 +965 @@
         for (j = 0; j < cArgs; j++)
         {
+            int cch = strlen(apszArgs[j]);
             if ((psz = strchr(apszArgs[j], ')')) == NULL)
             {   /* Common argument */
-                if (apszArgs[j][strlen(apszArgs[j]-1)] != '*')
-                {   /* Normal case, Type [moretype] Name.*/
-                    pFnDesc->apszParamName[j] = findStartOfWord(apszArgs[j] + strlen(apszArgs[j]) - 1,
-                                                            apszArgs[j]);
-                    pFnDesc->apszParamName[j][-1] = '\0';
+                if (apszArgs[j][cch-1] != '*' || (apszArgs[j][cch - 1] == ']' && cch < 5))
+                {   /* nearly Normal case, Type [moretype] Name.*/
+                    if (apszArgs[j][cch - 1] != ']')
+                    {   /* Normal case! */
+                        pFnDesc->apszParamName[j] = findStartOfWord(apszArgs[j] + cch - 1,
+                                                                    apszArgs[j]);
+                        pFnDesc->apszParamName[j][-1] = '\0';
+                    }
+                    else
+                    {   /* arg yet another special case! 'fn(int argc, char *argv[])' */
+                        char *pszP2;
+                        cch = strlen(apszArgs[j]);
+                        psz = &apszArgs[j][cch-2];
+                        while (psz > apszArgs[j] && ((*psz >= '0' && *psz <= '9') || *psz == ' '))
+                            psz--;
+
+                        if (psz > apszArgs[j] && *psz == '[')
+                        {
+                            pszP2 = psz--;
+                            while (psz >= apszArgs[j] && *psz == ' ')
+                                psz--;
+                        }
+
+                        if (psz <= apszArgs[j])
+                        {   /* funny case - no name? */
+                            sprintf(pszEnd, "arg%i", j);
+                            pFnDesc->apszParamName[j] = pszEnd;
+                            pszEnd = strlen(pszEnd) + pszEnd + 1;
+                            *pszEnd = '\0';
+                        }
+                        else
+                        {   /* *pszP2 = '[' and psz = end of name */
+                            psz = findStartOfWord(psz, apszArgs[j]);
+                            strncat(pszEnd, psz, pszP2 - psz);
+                            pFnDesc->apszParamName[j] = pszEnd;
+                            pszEnd = strlen(pszEnd) + pszEnd + 1;
+                            *pszEnd = '\0';
+                            memset(psz, ' ', pszP2 - psz);
+                        }
+                    }
                 }
                 else
@@ -1046 +1096 @@
         j -= 2;
     fFound = 0;
-    while (iStart >= 0 &&
-           !(fFound = (papszLines[iStart][j] == '/' && papszLines[iStart][j+1] == '*')))
-        if (j-- == 0)
+    while (iStart >= 0
+           && (j < 0
+               || !(fFound = (papszLines[iStart][j] == '/' && papszLines[iStart][j+1] == '*'))
+               )
+           )
+        if (j-- <= 0)
             if (iStart-- > 0)
             {
@@ -1289 +1342 @@
 
         while (*pszP1 != '\0' && *pszP1 == ' ')
-            pszP1--;
-        if (*pszP1 != '\0' && *pszP1 != '\\' && pszP1[1] != '\\'
+            pszP1++;
+        if (*pszP1 != '\0' && *pszP1 != '/' && pszP1[1] != '/'
             && *pszP1 != '{' && *pszP1 != '}')
         {
@@ -1570 +1623 @@
 /**
  * Creates an array of lines from a "memory" file. The last entry in the array contains NULL.
+ * It also replaces '\t' with ' '.
  * @returns   Pointer to the array of lines.
  * @param     pszFile  Pointer to "memory" file.
@@ -1599 +1653 @@
         while (*psz != '\0')
         {
+            if (*psz == '\t')
+                *psz = ' ';
             if (*psz == '\r')
             {
@@ -1638 +1694 @@
 
 
-/** staring char of word */
+/** starting char of word */
 static char *findStartOfWord(char *psz, const char *pszStart)
 {