Changeset 2759 for trunk/tools/database

Timestamp:

Feb 11, 2000, 7:35:55 PM (26 years ago)

Author:

bird

Message:

Odin32 DB.

Location:

trunk/tools/database

Files:

• APIImport.cpp (modified) (8 diffs)
• APIImport.h (modified) (2 diffs)
• CreateTables.sql (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• StateUpd.cpp (modified) (16 diffs)
• StateUpd.h (modified) (3 diffs)
• db.cpp (modified) (13 diffs)
• db.h (modified) (7 diffs)

trunk/tools/database/APIImport.cpp

@@ -1 @@
-/* $Id: APIImport.cpp,v 1.1 1999-09-05 02:53:04 bird Exp $ */
+/* $Id: APIImport.cpp,v 1.2 2000-02-11 18:35:53 bird Exp $ */
 /*
  *
  * APIImport - imports a DLL or Dll-.def with functions into the Odin32 database.
  *
- * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2000 knut st. osmundsen
  *
  */
@@ -34 +34 @@
 static void openLog(void);
 static void closeLog(void);
-static long processFile(const char *pszFilename, const POPTIONS pOptions);
+static long processFile(const char *pszFilename, const POPTIONS pOptions, long &cFunctions);
+static void demangle(const char *pszMangledName, char *pszDemangled);
 
 
@@ -54 +55 @@
     char   *pszUser     = "root";
     char   *pszPasswd   = "";
+    long    cFunctions  = 0;
+
 
     /**************************************************************************
@@ -127 +130 @@
             if (dbConnect(pszHost, pszUser, pszPasswd, pszDatabase))
             {
-                l = processFile(argv[argi], &options);
+                l = processFile(argv[argi], &options, cFunctions);
                 lRc = ((lRc & 0xffff0000UL) | (l & 0xffff0000UL)) | ((lRc & 0x0000ffffUL) + l & 0x0000ffffUL);
                 dbDisconnect();
@@ -141 +144 @@
         argi++;
     }
+
+    /* write function count */
+    if (phLog != NULL)
+        fprintf(phLog, "\n %d functions were imported!\n\n", cFunctions);
 
     /* close the log */
@@ -225 +232 @@
  * @param     pszFilename  Pointer to the filename of the file which is to be processed.
  * @param     pOptions     Pointer to the options-struct.
- */
-static long processFile(const char *pszFilename, const POPTIONS pOptions)
+ * @param     cFunctions   Function count which is to be updated when functions are imported.
+ */
+static long processFile(const char *pszFilename, const POPTIONS pOptions, long &cFunctions)
 {
     kFileFormatBase  *pFile;
@@ -275 +283 @@
                         if (!pFile->isDef() || export.ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
                         {
-                            if (export.achName[0] != '\0')
-                            {   /* name */
-                                int iName = strncmp(&export.achName[0], "_OS2", 4) != 0 ? 0 : 4;
-                                fprintf(phLog, "%s: %08ld %s\n", pszFilename, export.ulOrdinal, &export.achName[iName]);
-                                fOk = dbInsertUpdateFunction(sDll, &export.achName[iName], export.ulOrdinal,
-                                                             pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL);
-                            }
+                            char szIntName[64];
+                            char szName[64];
+
+                            demangle(export.achIntName, &szIntName[0]);
+                            if (export.achName == '\0')
+                                sprintf(&szName[0], "Ordinal%04ld", export.ulOrdinal);
                             else
-                            {   /* ordinal only */
-                                char szFn[50];
-
-                                sprintf(&szFn[0], "Ordinal%04ld", export.ulOrdinal);
-                                fprintf(phLog, "%s: %08ld %s\n", pszFilename, export.ulOrdinal, &szFn[0]);
-                                if (export.ulOrdinal != 0xffffffffUL)
-                                    fOk = dbInsertUpdateFunction(sDll, &szFn[0], export.ulOrdinal, pOptions->fIgnoreOrdinals);
-                                else
-                                    fprintf(phLog, "%s: error - invalid ordinal value!\n", pszFilename);
-                            }
+                                strcpy(&szName[0], &export.achName[0]);
+
+                            fprintf(phLog, "%s: %08ld %-30s %s\n",
+                                    pszFilename, export.ulOrdinal, &szName[0], &szIntName[0]);
+
+                            fOk = dbInsertUpdateFunction(sDll,
+                                                         &szName[0],
+                                                         &szIntName[0],
+                                                         export.ulOrdinal,
+                                                         pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL);
+                            if (fOk)
+                                cFunctions++;
                         }
 
@@ -330 +339 @@
 }
 
+
+/**
+ * Demangles stdcall functions.
+ * @param       pszMangledName  Mangled name
+ * @param       pszDemangled    Pointer to buffer which will hold the demangled name upon return.
+ */
+static void demangle(const char *pszMangledName, char *pszDemangled)
+{
+    int iEnd;
+    /* check for @ */
+    iEnd = strlen(pszMangledName);
+    if (iEnd-- > 3 && *pszMangledName == '_')
+    {
+        while ((pszMangledName[iEnd] >= '0' && pszMangledName[iEnd] <= '9') && iEnd > 0)
+            iEnd--;
+        if (pszMangledName[iEnd] == '@')
+        {
+            *pszDemangled = '\0';
+            strncat(pszDemangled, pszMangledName+1, iEnd - 1);
+            return;
+        }
+    }
+
+    /* not stdcall */
+    strcpy(pszDemangled, pszMangledName);
+}
+

trunk/tools/database/APIImport.h

@@ -1 @@
-/* $Id: APIImport.h,v 1.1 1999-09-05 02:53:04 bird Exp $ */
+/* $Id: APIImport.h,v 1.2 2000-02-11 18:35:53 bird Exp $ */
 /*
  * APIImportPE - imports a DLL with functions into the Odin32 database. Header.
@@ -13 +13 @@
 ******************************************************************************/
 #define MAJOR_VER 0
-#define MINOR_VER 4
+#define MINOR_VER 5
 
 /******************************************************************************

trunk/tools/database/CreateTables.sql

@@ -1 @@
--- $Id: CreateTables.sql,v 1.1 1999-09-05 02:53:04 bird Exp $
+-- $Id: CreateTables.sql,v 1.2 2000-02-11 18:35:54 bird Exp $
 --
 -- Create all tables.
@@ -30 +30 @@
     dll     TINYINT NOT NULL,
     name    VARCHAR(64) NOT NULL,
+    intname VARCHAR(64) NOT NULL,
     state   TINYINT NOT NULL DEFAULT 0,
     ordinal INTEGER NOT NULL,
     apigroup SMALLINT,
     return VARCHAR(64),
+    updated TINYINT NOT NULL DEFAULT 0,
     UNIQUE i1(refcode),
-    UNIQUE i2(name,dll)
+    UNIQUE i2(name,dll),
+    UNIQUE i3(intname, refcode)
 );
 

trunk/tools/database/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.5 2000-02-10 22:45:19 bird Exp $
+# $Id: Makefile,v 1.6 2000-02-11 18:35:55 bird Exp $
 
 #
@@ -13 +13 @@
 CINCLUDES= -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win -Igd -Imysql -I..\common
 !ifdef DEBUG
-CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ $(CINCLUDES)      -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
-CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ $(CINCLUDES) -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
+CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ -Tm- $(CINCLUDES)      -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
+CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ -Tm- $(CINCLUDES) -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft-
 LDFLAGS  = $(LDFLAGS)  -Ge+ -Fe$@ /B"/MAP:full" $(RTLLIB) os2386.lib
 !else

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.7 2000-02-10 23:37:52 bird Exp $
+/* $Id: StateUpd.cpp,v 1.8 2000-02-11 18:35:54 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -44 +44 @@
 static unsigned long analyseFnDcl2(PFNDESC pFnDesc, char **papszLines, int i, int &iRet, const char *pszFilename, POPTIONS pOptions);
 static BOOL  isFunction(char **papszLines, int i, POPTIONS pOptions);
+static long _System dbNotUpdatedCallBack(const char *pszValue, const char *pszFieldName, void *pvUser);
 static char *skipInsignificantChars(char **papszLines, int &i, char *psz);
 static char *readFileIntoMemory(const char *pszFilename);
@@ -66 +67 @@
     BOOL           fFatal = FALSE;
     unsigned long  ulRc = 0;
-    OPTIONS        options = {TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE};
+    char           szDLLName[64];
+    OPTIONS        options = {TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, &szDLLName[0], -1};
     unsigned long  ulRc2;
     char          *pszErrorDesc = NULL;
@@ -73 +75 @@
     char          *pszUser     = "root";
     char          *pszPasswd   = "";
-
+    ULONG          ul1, ul2;
     DosError(0x3);
+
+    /* get dll name from directory */
+    ul1 = ul2 = 0;
+    DosQueryCurrentDisk(&ul1, &ul2);
+    ul2 = sizeof(szDLLName);
+    DosQueryCurrentDir(ul1, &szDLLName[0], &ul2);
+    if (ul2 != 0)
+    {
+        if (szDLLName[ul2-1] == '\\' || szDLLName[ul2-1] == '/')
+            szDLLName[--ul2] = '\0';
+        ul1 = ul2;
+        while (ul1 != 0 && szDLLName[ul1-1] != '\\' && szDLLName[ul1-1] != '/')
+            ul1--;
+        if (ul1 != 0)
+            options.pszDLLName = &szDLLName[ul1];
+    }
+    else
+        szDLLName[0] = '\0';
+
 
     /**************************************************************************
@@ -87 +108 @@
     *           -COMCTL32<[+]|-> Removes 'COMCTL32'-prefix from function name.
     *           -VERSION<[+]|->  Removes 'VERSION'-prefix from function name.
+    *           -Dll:<dllname>   Name of the dll being processed.
     *           -d:<dbname>      Database name
     *           -p:<passwd>      Password
@@ -101 +123 @@
                 case 'd':
                 case 'D':
-                    if (argv[argi][2] == ':')
-                        pszDatabase = &argv[argi][3];
+                    if (strnicmp(argv[argi], "dll:", 4) == 0 )
+                        options.pszDLLName = &argv[argi][5];
                     else
-                        fprintf(stderr, "warning: option '-d:' requires database name.\n");
+                    {
+                        if (argv[argi][2] == ':')
+                            pszDatabase = &argv[argi][3];
+                        else
+                            fprintf(stderr, "warning: option '-d:' requires database name.\n");
+                    }
                     break;
 
@@ -217 +244 @@
         if (!options.fIntegrityOnly)
         {
+            /* find dll */
+            options.lDllRefcode = dbGetDll(options.pszDLLName);
+            fprintf(phLog, "DLL: refcode=%d, name=%s\n", options.lDllRefcode, options.pszDLLName);
+
             /* processing */
             if (argv[argi] == NULL || *argv[argi] == '\0')
@@ -253 +284 @@
         }
 
+        /* write status to log */
+        fprintf(phLog, "-------------------------------------------------\n");
+        fprintf(phLog, "-------- Functions which was not updated --------\n");
+        dbGetNotUpdatedFunction(options.lDllRefcode, dbNotUpdatedCallBack);
+        fprintf(phLog, "-------------------------------------------------\n");
+        fprintf(phLog, "-------------------------------------------------\n\n");
+        ul1 = dbCountFunctionInDll(options.lDllRefcode);
+        fprintf(phLog,"Number of function in this DLL:        %4ld\n", ul1);
+        fprintf(phLog,"Number of successfully processed APIs: %4ld\n", (long)(0x0000FFFF & ulRc));
+        fprintf(phLog,"Number of signals:                     %4ld\n", (long)(ulRc >> 16));
+
         /* close the logs */
         closeLogs();
@@ -260 +302 @@
 
         /* warn if error during processing. */
+        fprintf(stdout,"Number of function in this DLL:        %4ld\n", ul1);
         fprintf(stdout,"Number of successfully processed APIs: %4ld\n", (long)(0x0000FFFF & ulRc));
         fprintf(stdout,"Number of signals:                     %4ld\n", (long)(ulRc >> 16));
@@ -568 +611 @@
 
         /* 3.*/
-        fprintf(phLog, "Name:      '%s'  (refcode=%ld)\n", FnDesc.pszName, FnDesc.lRefCode);
+        fprintf(phLog, "Name:      '%s'  (refcodes=", FnDesc.pszName);
+        for (j = 0; j < FnDesc.cRefCodes; j++)
+            fprintf(phLog, j > 0 ? ", %ld" : "%ld", FnDesc.alRefCode[j]);
+        fprintf(phLog, ")\n");
         fprintf(phLog, "  Returns: '%s'\n", FnDesc.pszReturnType != NULL ? FnDesc.pszReturnType : "<missing>");
         fprintf(phLog, "  cParams: %2d\n", FnDesc.cParams);
@@ -640 +686 @@
     }
 
-    if (FnFindBuf.cFns == 0)
-    {
+    pFnDesc->cRefCodes = 0;
+    if (FnFindBuf.cFns != 0)
+    {
+        if (pOptions->lDllRefcode < 0)
+        {
+            if (FnFindBuf.cFns > 1)
+            {
+                fprintf(phSignal, "%s: unknown dll and more than two occurences of this function!\n", pszFilename);
+                return 0x00010000;
+            }
+            pOptions->lDllRefcode = FnFindBuf.alDllRefCode[0];
+            fprintf(phLog, "DllRef = %d\n", pOptions->lDllRefcode);
+        }
+
+        for (lFn = 0; lFn < FnFindBuf.cFns; lFn++)
+        {
+            if (FnFindBuf.alDllRefCode[lFn] == pOptions->lDllRefcode)
+                pFnDesc->alRefCode[pFnDesc->cRefCodes++] = FnFindBuf.alRefCode[lFn];
+        }
+
+        if (pFnDesc->cRefCodes == 0)
+            fprintf(phLog, "%s was not an API in this dll(%d)!\n", pFnDesc->pszName, pOptions->lDllRefcode);
+    }
+    else
         fprintf(phLog, "%s was not an API\n", pFnDesc->pszName);
-        return 0;
-    }
-    else if (FnFindBuf.cFns > 1)
-    {   /* 3b.*/
-        while (lFn < (int)FnFindBuf.cFns && FnFindBuf.alDllRefCode[lFn] != lPrevFnDll)
-            lFn++;
-        if (lPrevFnDll == -1L && lFn >= (int)FnFindBuf.cFns)
-        {
-            fprintf(phSignal, "%s, %s: error - more than one function by the name '%s'\n",
-                    pszFilename, pFnDesc->pszName, pFnDesc->pszName);
-            return 0x00010000;
-        }
-    }
-    pFnDesc->lRefCode = FnFindBuf.alRefCode[lFn];
-    lPrevFnDll = FnFindBuf.alDllRefCode[lFn];
-
+
+    ulRc = pFnDesc->cRefCodes;
     return ulRc;
 }
@@ -681 +735 @@
      * 1. find the '('
      * 2. find the word ahead of the '(', this is the function name.
+     * 2a. class test.
      * 3. find the closing ')'
      * 4. copy the parameters, which is between the two '()'
@@ -687 +742 @@
 
     int     iFn, iP1, iP2, j;
-    char *  pszFn, *pszP1, *pszP2;
+    char *  pszFn, *pszFnEnd, *pszP1, *pszP2;
     char *  psz, *pszEnd;
     int     cArgs;
@@ -729 +784 @@
         return 0x00010000;
     }
+    pszFnEnd = pszFn;
     pszFn = findStartOfWord(pszFn, papszLines[i]);
+
+    /* 2a. */
+    psz = pszFn;
+    while (psz >= papszLines[i] && *psz == ' ')
+        psz--;
+    if (psz > papszLines[i] && *psz == ':')
+    {
+        while (psz >= papszLines[i] && *psz == ' ')
+            psz--;
+        if (psz > papszLines[i] && *psz == ':')
+        {
+            while (psz >= papszLines[i] && *psz == ' ')
+                psz--;
+            if (psz > papszLines[i])
+                pszFn = findStartOfWord(psz, papszLines[i]);
+            else
+                fprintf(phLog, "%.*s: class name is not at same line as the ::\n", pszFnEnd - psz-1, psz+1);
+        }
+        else
+        {
+            fprintf(phLog, "%.*s: invalid class '::'\n", pszFnEnd - psz, psz);
+            return 0;
+        }
+    }
 
     /* 3. */
@@ -792 +872 @@
     else
     {
+        /* return type - not implemented TODO/FIXME! */
+        *pszEnd = '\0';
+        copy(pszEnd, papszLines[i], i, pszFn-1, iFn, papszLines);
+        pFnDesc->pszReturnType = *pszEnd == '\0' ? NULL : pszEnd;
+        pszEnd = strlen(pszEnd) + pszEnd + 1;
+
         /* function name */
         *pszEnd = '\0';
-        strncat(pszEnd, pszFn, findEndOfWord(pszFn) - pszFn);
+        if (pFnDesc->pszReturnType != NULL
+            && stristr(pFnDesc->pszReturnType, "cdecl") != NULL)
+        {   /* cdecl function is prefixed with an '_' */
+            strcpy(pszEnd, "_");
+            strncat(pszEnd+1, pszFn, pszFnEnd - pszFn+1);
+        }
+        else
+            strncat(pszEnd, pszFn, pszFnEnd - pszFn+1);
+
         pFnDesc->pszName = pszEnd;
-
-        /* return type - not implemented TODO/FIXME! */
-        pFnDesc->pszReturnType = NULL;
 
         /* arguments */
@@ -1227 +1318 @@
 
 
+
+/**
+ * Callback function for the dbGetNotUpdatedFunction routine.
+ *
+ */
+static long _System dbNotUpdatedCallBack(const char *pszValue, const char *pszFieldName, void *pvUser)
+{
+    if (stricmp(pszFieldName, "name") == 0)
+        fprintf(phLog, "%s ", pszValue);
+    else if (stricmp(pszFieldName, "updated") == 0)
+        fprintf(phLog, "update=%s ", pszValue);
+    else if (stricmp(pszFieldName, "intname") == 0)
+        fprintf(phLog, "(%s)\n", pszValue);
+
+    pvUser = pvUser;
+    return 0;
+}
+
+
 /**
  * Skips insignificant chars (spaces, new-lines and comments)

trunk/tools/database/StateUpd.h

@@ -1 @@
-/* $Id: StateUpd.h,v 1.1 1999-09-05 02:53:05 bird Exp $ */
+/* $Id: StateUpd.h,v 1.2 2000-02-11 18:35:54 bird Exp $ */
 /*
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -10 +10 @@
 
 #define MAJOR_VER   0
-#define MINOR_VER   4
+#define MINOR_VER   5
 
 #pragma pack()
@@ -16 +16 @@
 typedef struct _options
 {
-    BOOL fIntegrityBefore;  /* ib  */
-    BOOL fIntegrityAfter;   /* ie  */
-    BOOL fIntegrityOnly;    /* io  */
-    BOOL fRecursive;        /* s   */
-    BOOL fOld;              /* Old */
-    BOOL fOS2;              /* Ignore OS2 prefixes */
-    BOOL fCOMCTL32;         /* Ignore COMCTL32 prefixes */
-    BOOL fVERSION;          /* Ignore VERSION prefixes */
+    BOOL        fIntegrityBefore;  /* ib  */
+    BOOL        fIntegrityAfter;   /* ie  */
+    BOOL        fIntegrityOnly;    /* io  */
+    BOOL        fRecursive;        /* s   */
+    BOOL        fOld;              /* Old */
+    BOOL        fOS2;              /* Ignore OS2 prefixes */
+    BOOL        fCOMCTL32;         /* Ignore COMCTL32 prefixes */
+    BOOL        fVERSION;          /* Ignore VERSION prefixes */
+    char *      pszDLLName;        /* Name of the dll being processed */
+    signed long lDllRefcode;       /* Database reference code of the dll */
 } OPTIONS, *POPTIONS;
 

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.4 2000-02-10 22:10:40 bird Exp $ */
+/* $Id: db.cpp,v 1.5 2000-02-11 18:35:54 bird Exp $ */
 /*
  * DB - contains all database routines.
@@ -29 +29 @@
     pres2 = mysql_store_result(pmysql);\
     if (rc < 0 || pres2 == NULL ||     \
-        mysql_num_rows(pres2) <= 0)    \
+        mysql_num_rows(pres2) == 0)    \
     {                                  \
         if (pszError[1] == '\xFE')     \
@@ -151 +151 @@
 }
 
+/**
+ * Gets the refid for the give dll name.
+ * @returns   Dll refid. -1 on error.
+ * @param     pszDllName  Dll name.
+ */
+signed short _System dbGetDll(const char *pszDllName)
+{
+    int         rc;
+    char        szQuery[256];
+    MYSQL_RES * pres;
+
+    sprintf(&szQuery[0], "SELECT refcode FROM dll WHERE name = '%s'\n", pszDllName);
+    rc   = mysql_query(pmysql, &szQuery[0]);
+    pres = mysql_store_result(pmysql);
+
+    if (rc >= 0 && pres != NULL && mysql_num_rows(pres) == 1)
+        rc = (int)getvalue(0, mysql_fetch_row(pres));
+    else
+        rc = -1;
+    mysql_free_result(pres);
+    return (short)rc;
+}
+
+
+/**
+ * Count the function in a given dll.
+ * @returns  Number of functions. -1 on error.
+ * @param    usDll  Dll refcode.
+ */
+signed long     _System dbCountFunctionInDll(signed long ulDll)
+{
+    signed long rc;
+    char        szQuery[256];
+    MYSQL_RES * pres;
+
+    if (ulDll >= 0)
+    {
+        sprintf(&szQuery[0], "SELECT count(refcode) FROM function WHERE dll = %d\n", ulDll);
+        rc   = mysql_query(pmysql, &szQuery[0]);
+        pres = mysql_store_result(pmysql);
+
+        if (rc >= 0 && pres != NULL && mysql_num_rows(pres) == 1)
+            rc = (int)getvalue(0, mysql_fetch_row(pres));
+        else
+            rc = -1;
+        mysql_free_result(pres);
+    }
+    else
+        rc = -1;
+    return rc;
+}
+
+
 
 /**
@@ -161 +214 @@
 signed short _System dbCheckInsertDll(const char *pszDll)
 {
-    int  rc;
-    char szQuery[256];
-    MYSQL_RES *pres;
+    int         rc;
+    char        szQuery[256];
+    MYSQL_RES * pres;
 
     /* try find match */
@@ -230 +283 @@
  * @returns   Success indicator. TRUE / FALSE.
  * @param     usDll           Dll refcode.
- * @param     pszFunction     Functionname.
+ * @param     pszFunction     Function name.
+ * @param     pszIntFunction  Internal function name.
  * @param     ulOrdinal       Ordinal value.
  * @param     fIgnoreOrdinal  Do not update ordinal value.
  */
-BOOL _System dbInsertUpdateFunction(unsigned short usDll, const char *pszFunction,
+BOOL _System dbInsertUpdateFunction(unsigned short usDll,
+                                    const char *pszFunction, const char *pszIntFunction,
                                     unsigned long ulOrdinal, BOOL fIgnoreOrdinal)
 {
@@ -242 +297 @@
     MYSQL_RES *pres;
 
+    /* when no internal name, the exported name is the internal name too! */
+    if (pszIntFunction == NULL || *pszIntFunction == '\0')
+        pszIntFunction = pszFunction;
+
     /* try find function */
-    sprintf(&szQuery[0], "SELECT refcode FROM function WHERE dll = %d AND name = '%s'", usDll, pszFunction);
+    sprintf(&szQuery[0], "SELECT refcode, intname FROM function WHERE dll = %d AND name = '%s'", usDll, pszFunction);
     rc = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
-    if (rc >= 0 && pres != NULL && mysql_num_rows(pres) > 0)
+    if (rc >= 0 && pres != NULL && mysql_num_rows(pres) != 0)
     {   /* update function (function is found) */
         MYSQL_ROW parow;
@@ -261 +320 @@
         mysql_free_result(pres);
 
-        if (!fIgnoreOrdinal)
+        if (strcmp(parow[1], pszIntFunction) != 0)
+        {
+            sprintf(&szQuery[0], "UPDATE function SET intname = '%s' WHERE refcode = %ld",
+                    pszIntFunction, lFunction);
+            rc = mysql_query(pmysql, &szQuery[0]);
+        }
+
+        if (rc >= 0 && !fIgnoreOrdinal)
         {
             sprintf(&szQuery[0], "UPDATE function SET ordinal = %ld WHERE refcode = %ld",
@@ -267 +333 @@
             rc = mysql_query(pmysql, &szQuery[0]);
         }
+
     }
     else
     {   /* insert */
-        sprintf(&szQuery[0], "INSERT INTO function(dll, name, ordinal) VALUES(%d, '%s', %ld)",
-                usDll, pszFunction, ulOrdinal);
+        sprintf(&szQuery[0], "INSERT INTO function(dll, name, intname, ordinal) VALUES(%d, '%s', '%s', %ld)",
+                usDll, pszFunction, pszIntFunction, ulOrdinal);
         rc = mysql_query(pmysql, &szQuery[0]);
     }
@@ -295 +362 @@
 
 /**
- * Find occurences of a function, given by name.
+ * Find occurences of a function, given by internal name.
  * @returns   success indicator, TRUE / FALSE.
  * @param     pszFunctionName
@@ -307 +374 @@
     char         szQuery[256];
 
-    sprintf(&szQuery[0], "SELECT refcode, dll FROM function WHERE name = '%s'", pszFunctionName);
+    sprintf(&szQuery[0], "SELECT refcode, dll FROM function WHERE intname = '%s'",
+            pszFunctionName, pszFunctionName);
 
     rc = mysql_query(pmysql, &szQuery[0]);
@@ -416 +484 @@
     char *pszQuery = &szQuery[0];
     long  lCurrentState;
-    int   i,rc;
+    int   i,k,rc;
     unsigned long ulRc = 0;
     BOOL          f = FALSE;
 
-    lCurrentState = dbGetFunctionState(pFnDesc->lRefCode);
-    if (lCurrentState == -1)
-    {
-        strcpy(pszError, dbGetLastErrorDesc());
-        return 1;
-    }
-
-    /* update function table first */
-    strcpy(pszQuery, "UPDATE function SET ");
-    pszQuery += strlen(pszQuery);
-    if (pFnDesc->lStatus != 99 || lCurrentState == 0)
-    {
-        sprintf(pszQuery, "state = %ld ", pFnDesc->lStatus);
-        f = TRUE;
-    }
-    pszQuery += strlen(pszQuery);
-
-    if (pFnDesc->pszReturnType != NULL)
-    {
+    for (k = 0; k < pFnDesc->cRefCodes; k++)
+    {
+        /* set updated flag */
+        sprintf(pszQuery, "UPDATE function SET updated = updated + 1 WHERE refcode = %d",
+                pFnDesc->alRefCode[k]);
+        rc = mysql_query(pmysql, &szQuery[0]);
+
+        /* get current status */
+        lCurrentState = dbGetFunctionState(pFnDesc->alRefCode[k]);
+        if (lCurrentState == -1)
+        {
+            strcpy(pszError, dbGetLastErrorDesc());
+            return 1;
+        }
+
+        /* update function table first */
+        strcpy(pszQuery, "UPDATE function SET ");
+        pszQuery += strlen(pszQuery);
+        if (pFnDesc->lStatus != 99 || lCurrentState == 0)
+        {
+            sprintf(pszQuery, "state = %ld ", pFnDesc->lStatus);
+            f = TRUE;
+        }
+        pszQuery += strlen(pszQuery);
+
+        if (pFnDesc->pszReturnType != NULL)
+        {
+            if (f)
+            {
+                strcat(pszQuery, ", ");
+                pszQuery += strlen(pszQuery);
+            }
+            sprintf(pszQuery, "return = '%s' ", pFnDesc->pszReturnType);
+            pszQuery += strlen(pszQuery);
+            f = TRUE;
+        }
+
         if (f)
         {
-            strcat(pszQuery, ", ");
-            pszQuery += strlen(pszQuery);
-        }
-        sprintf(pszQuery, "return = '%s' ", pFnDesc->pszReturnType);
-        pszQuery += strlen(pszQuery);
-        f = TRUE;
-    }
-
-    if (f)
-    {
-        sprintf(pszQuery, "WHERE refcode = %ld", pFnDesc->lRefCode);
+            sprintf(pszQuery, "WHERE refcode = %ld", pFnDesc->alRefCode[k]);
+            rc = mysql_query(pmysql, &szQuery[0]);
+            if (rc < 0)
+            {
+                sprintf(pszError, "Updating functiontable failed with error: %s - (sql=%s) ",
+                        dbGetLastErrorDesc(), &szQuery[0]);
+                pszError += strlen(pszError) - 1;
+                ulRc++;
+            }
+        }
+
+        /* parameters */
+        pszQuery = &szQuery[0];
+        sprintf(pszQuery, "DELETE FROM parameter WHERE function = %ld", pFnDesc->alRefCode[k]);
         rc = mysql_query(pmysql, &szQuery[0]);
         if (rc < 0)
         {
-            sprintf(pszError, "Updating functiontable failed with error: %s - (sql=%s) ",
+            if (*pszError == ' ')
+                strcpy(pszError++, "\n\t");
+            sprintf(pszError, "Deleting old parameters failed with error: %s - (sql=%s) ",
                     dbGetLastErrorDesc(), &szQuery[0]);
             pszError += strlen(pszError) - 1;
             ulRc++;
         }
-    }
-
-    /* parameters */
-    pszQuery = &szQuery[0];
-    sprintf(pszQuery, "DELETE FROM parameter WHERE function = %ld", pFnDesc->lRefCode);
-    rc = mysql_query(pmysql, &szQuery[0]);
-    if (rc < 0)
-    {
-        if (*pszError == ' ')
-            strcpy(pszError++, "\n\t");
-        sprintf(pszError, "Deleting old parameters failed with error: %s - (sql=%s) ",
-                dbGetLastErrorDesc(), &szQuery[0]);
-        pszError += strlen(pszError) - 1;
-        ulRc++;
-    }
-
-    for (i = 0; i < pFnDesc->cParams; i++)
-    {
-        sprintf(pszQuery, "INSERT INTO parameter(function, sequencenbr, type, name) "
-                "VALUES (%ld, %d, '%s', '%s')",
-                pFnDesc->lRefCode, i,
-                pFnDesc->apszParamType[i] != NULL ? pFnDesc->apszParamType[i] : "",
-                pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : ""
-                );
-        rc = mysql_query(pmysql, pszQuery);
+
+        for (i = 0; i < pFnDesc->cParams; i++)
+        {
+            sprintf(pszQuery, "INSERT INTO parameter(function, sequencenbr, type, name) "
+                    "VALUES (%ld, %d, '%s', '%s')",
+                    pFnDesc->alRefCode[k], i,
+                    pFnDesc->apszParamType[i] != NULL ? pFnDesc->apszParamType[i] : "",
+                    pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : ""
+                    );
+            rc = mysql_query(pmysql, pszQuery);
+            if (rc < 0)
+            {
+                if (*pszError == ' ')
+                    strcpy(pszError++, "\n\t");
+                sprintf(pszError, "Inserting parameter %i failed with error: %s - (sql=%s) ",
+                        i, dbGetLastErrorDesc(), &szQuery[0]);
+                pszError += strlen(pszError) - 1;
+                ulRc++;
+            }
+        }
+
+        /* authors */
+        pszQuery = &szQuery[0];
+        sprintf(pszQuery, "DELETE FROM fnauthor WHERE function = %ld", pFnDesc->alRefCode[k]);
+        rc = mysql_query(pmysql, &szQuery[0]);
         if (rc < 0)
         {
             if (*pszError == ' ')
                 strcpy(pszError++, "\n\t");
-            sprintf(pszError, "Inserting parameter %i failed with error: %s - (sql=%s) ",
-                    i, dbGetLastErrorDesc(), &szQuery[0]);
+            sprintf(pszError, "Deleting old authors failed with error: %s - (sql=%s) ",
+                    dbGetLastErrorDesc(), &szQuery[0]);
             pszError += strlen(pszError) - 1;
             ulRc++;
         }
-    }
-
-    /* authors */
-    pszQuery = &szQuery[0];
-    sprintf(pszQuery, "DELETE FROM fnauthor WHERE function = %ld", pFnDesc->lRefCode);
-    rc = mysql_query(pmysql, &szQuery[0]);
-    if (rc < 0)
-    {
-        if (*pszError == ' ')
-            strcpy(pszError++, "\n\t");
-        sprintf(pszError, "Deleting old authors failed with error: %s - (sql=%s) ",
-                dbGetLastErrorDesc(), &szQuery[0]);
-        pszError += strlen(pszError) - 1;
-        ulRc++;
-    }
-
-    for (i = 0; i < pFnDesc->cAuthors; i++)
-    {
-        if (pFnDesc->alAuthorRefCode[i] == -1)
-            continue;
-        sprintf(pszQuery, "INSERT INTO fnauthor(author, function) "
-                "VALUES (%ld, %ld)",
-                pFnDesc->alAuthorRefCode[i], pFnDesc->lRefCode);
-        rc = mysql_query(pmysql, pszQuery);
-        if (rc < 0)
-        {
-            if (*pszError == ' ')
-                strcpy(pszError++, "\n\t");
-            sprintf(pszError, "Inserting parameter %i failed with error: %s - (sql=%s) ",
-                    i, dbGetLastErrorDesc(), &szQuery[0]);
-            pszError += strlen(pszError) - 1;
-            ulRc++;
-        }
-    }
-
+
+        for (i = 0; i < pFnDesc->cAuthors; i++)
+        {
+            if (pFnDesc->alAuthorRefCode[i] == -1)
+                continue;
+            sprintf(pszQuery, "INSERT INTO fnauthor(author, function) "
+                    "VALUES (%ld, %ld)",
+                    pFnDesc->alAuthorRefCode[i], pFnDesc->alRefCode[k]);
+            rc = mysql_query(pmysql, pszQuery);
+            if (rc < 0)
+            {
+                if (*pszError == ' ')
+                    strcpy(pszError++, "\n\t");
+                sprintf(pszError, "Inserting parameter %i failed with error: %s - (sql=%s) ",
+                        i, dbGetLastErrorDesc(), &szQuery[0]);
+                pszError += strlen(pszError) - 1;
+                ulRc++;
+            }
+        }
+    } /* for */
     return ulRc;
 }
@@ -908 +984 @@
     rc = mysql_query(pmysql, pszQuery);
     pres = mysql_store_result(pmysql);
-    if (rc < 0 || (pres != NULL && mysql_num_rows(pres) > 0))
+    if (rc < 0 || (pres != NULL && mysql_num_rows(pres) != 0))
     {   /* some kind of error has occurred */
         if (pszError[1] == '\xFE')
@@ -1099 +1175 @@
         }
     }
+
+    return fRet;
+}
+
+
+/**
+ * Display all functions for, the given dll, that is not updated.
+ * @returns   TRUE / FALSE.
+ * @param     lDll         Dll reference number.
+ * @param     dbFetchCall  Callback function which will be called once for each
+ *                         field for all the functions not updated.
+ *                         pvUser is NULL, pszValue field value, pszFieldName the field name.
+ */
+BOOL _System dbGetNotUpdatedFunction(signed long lDll, DBCALLBACKFETCH dbFetchCallBack)
+{
+    BOOL        fRet = FALSE;
+    void       *pres;
+    char        szQuery[128];
+
+    /* not updated names */
+    sprintf(&szQuery[0], "SELECT name, intname FROM function WHERE dll = %d AND updated = 0",
+            lDll);
+    pres = dbExecuteQuery(szQuery);
+    if (pres != NULL)
+    {
+        BOOL f;
+        do
+        {
+            f = dbFetch(pres, dbFetchCallBack, NULL);
+        } while (f);
+        dbFreeResult(pres);
+        fRet = TRUE;
+    }
+
+    /* warn about updated > 1 too */
+    sprintf(&szQuery[0], "SELECT updated, name, intname FROM function WHERE dll = %d AND updated > 1",
+            lDll);
+    pres = dbExecuteQuery(szQuery);
+    if (pres != NULL)
+    {
+        BOOL f;
+        do
+        {
+            f = dbFetch(pres, dbFetchCallBack, NULL);
+        } while (f);
+        dbFreeResult(pres);
+        fRet = TRUE;
+    }
+
+    sprintf(&szQuery[0], "UPDATE function SET updated = 0",
+            lDll);
+    mysql_query(pmysql, &szQuery[0]);
 
     return fRet;

trunk/tools/database/db.h

@@ -1 @@
-/* $Id: db.h,v 1.2 1999-12-06 18:11:50 bird Exp $ */
+/* $Id: db.h,v 1.3 2000-02-11 18:35:54 bird Exp $ */
 /*
  * DB - contains all database routines
@@ -15 +15 @@
 #endif
 
+
+/*******************************************************************************
+*   Defined Constants                                                          *
+*******************************************************************************/
+#define NBR_FUNCTIONS   20
+#define NBR_AUTHORS     20
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -27 +34 @@
         char *pszName;
         char *pszReturnType;
-        long  lRefCode;
+        long  cRefCodes;
+        long  alRefCode[NBR_FUNCTIONS];
 
         /* parameters */
@@ -36 +44 @@
         /* authors */
         int   cAuthors;
-        char *apszAuthor[20];
-        long  alAuthorRefCode[20];
+        char *apszAuthor[NBR_AUTHORS];
+        long  alAuthorRefCode[NBR_AUTHORS];
 
         /* status */
@@ -48 +56 @@
     {
         unsigned long cFns;
-        signed long   alRefCode[10];
-        signed long   alDllRefCode[10];
+        signed long   alRefCode[NBR_FUNCTIONS];
+        signed long   alDllRefCode[NBR_FUNCTIONS];
     } FNFINDBUF, *PFNFINDBUF;
 
@@ -59 +67 @@
     char *          _System dbGetLastErrorDesc(void);
 
-    BOOL            _System dbConnect(const char *pszHost, const char *pszUser, const char *pszPassword, const char *pszDatabase);
+    BOOL            _System dbConnect(const char *pszHost,
+                                      const char *pszUser,
+                                      const char *pszPassword,
+                                      const char *pszDatabase);
     BOOL            _System dbDisconnect();
+    signed short    _System dbGetDll(const char *pszDllName);
+    signed long     _System dbCountFunctionInDll(signed long ulDll);
+
     signed short    _System dbCheckInsertDll(const char *pszDll);
-    unsigned short  _System dbGet(const char *pszTable, const char *pszGetColumn,
-                                const char *pszMatch1, const char *pszMatchValue1);
-    BOOL            _System dbInsertUpdateFunction(unsigned short usDll, const char *pszFunction,
-                                unsigned long ulOrdinal, BOOL fIgnoreOrdinal);
-    BOOL            _System dbFindFunction(const char *pszFunctionName, PFNFINDBUF pFnFindBuf);
+    unsigned short  _System dbGet(const char *pszTable,
+                                  const char *pszGetColumn,
+                                  const char *pszMatch1,
+                                  const char *pszMatchValue1);
+    BOOL            _System dbInsertUpdateFunction(unsigned short usDll,
+                                                   const char *pszFunction,
+                                                   const char *pszIntFunction,
+                                                   unsigned long ulOrdinal,
+                                                   BOOL fIgnoreOrdinal);
+    BOOL            _System dbFindFunction(const char *pszFunctionName,
+                                           PFNFINDBUF pFnFindBuf);
     signed long     _System dbFindAuthor(const char *pszAuthor);
     signed long     _System dbGetFunctionState(signed long lRefCode);
-    unsigned long   _System dbUpdateFunction(PFNDESC pFnDesc, char *pszError);
+    unsigned long   _System dbUpdateFunction(PFNDESC pFnDesc,
+                                             char *pszError);
     unsigned long   _System dbCreateHistory(char *pszError);
     unsigned long   _System dbCheckIntegrity(char *pszError);
@@ -77 +98 @@
     signed long     _System dbQueryResultRows(void *pres);
     BOOL            _System dbFreeResult(void *pres);
-    BOOL            _System dbFetch(void *pres, DBCALLBACKFETCH dbFetchCallBack, void *pvUser);
+    BOOL            _System dbFetch(void *pres,
+                                    DBCALLBACKFETCH dbFetchCallBack,
+                                    void *pvUser);
     signed long     _System dbDateToDaysAfterChrist(const char *pszDate);
-    BOOL            _System dbDaysAfterChristToDate(signed long ulDays, char *pszDate);
+    BOOL            _System dbDaysAfterChristToDate(signed long ulDays,
+                                                    char *pszDate);
+    /* StateUpd stuff */
+    BOOL            _System dbGetNotUpdatedFunction(signed long lDll,
+                                                    DBCALLBACKFETCH dbFetchCallBack);
 
 #ifdef __cplusplus