Changeset 8421 for trunk/src/setupapi/setupx_main.c

Timestamp:

May 15, 2002, 2:39:57 PM (23 years ago)

Author:

sandervl

Message:

wine resync

File:

• trunk/src/setupapi/setupx_main.c (modified) (22 diffs)

trunk/src/setupapi/setupx_main.c

@@ -3 +3 @@
  *
  *      Copyright 1998,2000  Andreas Mohr
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * FIXME: Rather non-functional functions for now.
@@ -30 +44 @@
  * Ip   .INF parsing (infparse.c)
  * LDD  logical device descriptor (ldd.c ?)
- * LDID logical device ID 
+ * LDID logical device ID
  * SU   setup (setup.c ?)
  * Tp   text processing (textproc.c ?)
@@ -44 +58 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "winreg.h"
+#include "winerror.h"
 #include "wine/winuser16.h"
+#include "setupapi.h"
 #include "setupx16.h"
-#include "setupx_private.h"
+#include "setupapi_private.h"
 #include "winerror.h"
-#include "heap.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(setupx);
-
-/***********************************************************************
- *              SURegOpenKey
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+
+/***********************************************************************
+ *              SURegOpenKey (SETUPX.47)
  */
 DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
@@ -64 +80 @@
 
 /***********************************************************************
- *              SURegQueryValueEx
+ *              SURegQueryValueEx (SETUPX.50)
  */
 DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
@@ -123 +139 @@
         p = q+1;
     }
-    
+
     /* put number of entries at beginning of list */
     *(DWORD *)res = count;
@@ -141 +157 @@
 }
 
-static void SETUPX_IsolateSubString(LPSTR *begin, LPSTR *end)
-{
-    LPSTR p, q;
-
-    p = *begin;
-    q = *end;
-
-    while ((p < q) && ((*p == ' ') || (*p == '\t'))) p++;
-    while ((p < q) && (*p == '"')) p++;
-
-    while ((q-1 >= p) && ((*(q-1) == ' ') || (*(q-1) == '\t'))) q--;
-    while ((q-1 >= p) && (*(q-1) == '"')) q--;
-
-    *begin = p;
-    *end = q;
-}
-
-/*
- * Example: HKLM,"Software\Microsoft\Windows\CurrentVersion","ProgramFilesDir",,"C:\"
- * FIXME: use SETUPX_GetSubStrings() instead.
- *        Hmm, but on the other hand SETUPX_GetSubStrings() will probably
- *        soon be replaced by InitSubstrData() etc. anyway.
- * 
- */
-static BOOL SETUPX_LookupRegistryString(LPSTR regstr, LPSTR buffer, DWORD buflen)
-{
-    HANDLE heap = GetProcessHeap();
-    LPSTR items[5];
-    LPSTR p, q, next;
-    int len, n;
-    HKEY hkey, hsubkey;
-    DWORD dwType;
-
-    TRACE("retrieving '%s'\n", regstr);
-
-    p = regstr;
-
-    /* isolate root key, subkey, value, flag, defval */
-    for (n=0; n < 5; n++)
-    {
-        q = strchr(p, ',');
-        if (!q)
-        {
-            if (n == 4)
-                q = p+strlen(p);
-            else
-                return FALSE;
-        }
-        next = q+1;
-        if (q < regstr)
-            return FALSE;
-        SETUPX_IsolateSubString(&p, &q);
-        len = (int)q - (int)p;
-        items[n] = HeapAlloc(heap, 0, len+1);
-        strncpy(items[n], p, len);
-        items[n][len] = '\0';
-        p = next;
-    }
-    TRACE("got '%s','%s','%s','%s','%s'\n",
-                        items[0], items[1], items[2], items[3], items[4]);
-    
-    /* check root key */
-    if (!strcasecmp(items[0], "HKCR"))
-        hkey = HKEY_CLASSES_ROOT;
-    else
-    if (!strcasecmp(items[0], "HKCU"))
-        hkey = HKEY_CURRENT_USER;
-    else
-    if (!strcasecmp(items[0], "HKLM"))
-        hkey = HKEY_LOCAL_MACHINE;
-    else
-    if (!strcasecmp(items[0], "HKU"))
-        hkey = HKEY_USERS;
-    else
-    { /* HKR ? -> relative to key passed to GenInstallEx */
-        FIXME("unsupported regkey '%s'\n", items[0]);
-        goto regfailed;
-    }
-
-    if (RegOpenKeyA(hkey, items[1], &hsubkey) != ERROR_SUCCESS)
-        goto regfailed;
-
-    if (RegQueryValueExA(hsubkey, items[2], NULL, &dwType, buffer, &buflen)
-                != ERROR_SUCCESS)
-        goto regfailed;
-    goto done;
-
-regfailed:
-    if (buffer) strcpy(buffer, items[4]); /* I don't care about buflen */
-done:
-    for (n=0; n < 5; n++)
-        HeapFree(heap, 0, items[n]);
-    if (buffer)
-        TRACE("return '%s'\n", buffer);
-    return TRUE;
-}
-
-static LPSTR SETUPX_GetSections(LPCSTR filename)
-{
-    LPSTR buf = NULL;
-    DWORD len = 1024, res;
-
-    do {
-        buf = HeapReAlloc(GetProcessHeap(), 0, buf, len);
-        res = GetPrivateProfileStringA(NULL, NULL, NULL, buf, len, filename);
-        len *= 2;
-    } while ((!res) && (len < 1048576));
-    if (!res)
-    {
-        HeapFree(GetProcessHeap(), 0, buf);
-        return NULL;
-    }
-    return buf;
-}
-
-static LPSTR SETUPX_GetSectionEntries(LPCSTR filename, LPCSTR section)
-{
-    LPSTR buf = NULL;
-    DWORD len = 1024, res;
-
-    do {
-        buf = HeapReAlloc(GetProcessHeap(), 0, buf, len);
-        res = GetPrivateProfileSectionA(section, buf, len, filename);
-        len *= 2;
-    } while ((!res) && (len < 1048576));
-    if (!res)
-    {
-        HeapFree(GetProcessHeap(), 0, buf);
-        return NULL;
-    }
-    return buf;
-}
-
-
-/***********************************************************************
- *              InstallHinfSection
+
+/***********************************************************************
+ *              InstallHinfSection (SETUPX.527)
  *
  * hwnd = parent window
@@ -283 +166 @@
  * Here "DefaultInstall" is the .inf file section to be installed (optional).
  * The 132 value is made of the HOW_xxx flags and sometimes 128 (-> setupx16.h).
- * 
+ *
  * nCmdShow = nCmdShow of CreateProcess
  */
-typedef INT WINAPI (*MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
 RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow)
 {
@@ -292 +174 @@
     DWORD count;
     HINF16 hInf = 0;
-    RETERR16 res = OK;
+    RETERR16 res = OK, tmp;
     WORD wFlags;
     BOOL reboot = FALSE;
-    HMODULE hMod;
-    MSGBOX_PROC pMessageBoxA;
-    
+
     TRACE("(%04x, %04x, %s, %d);\n", hwnd, hinst, lpszCmdLine, nCmdShow);
-    
+
     pSub = SETUPX_GetSubStrings((LPSTR)lpszCmdLine, ' ');
 
@@ -310 +190 @@
         goto end;
     }
+    if (VcpOpen16(NULL, 0))
+        goto end;
     if (GenInstall16(hInf, *(pSub+count-2), GENINSTALL_DO_ALL) != OK)
         goto end;
@@ -321 +203 @@
         case HOW_ALWAYS_PROMPT_REBOOT:
         case HOW_PROMPT_REBOOT:
-            if ((hMod = GetModuleHandleA("user32.dll")))
-            {
-              if ((pMessageBoxA = (MSGBOX_PROC)GetProcAddress( hMod, "MessageBoxA" )))
-              {
-                 
-                if (pMessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
-                  reboot = TRUE;
-              }
-            }
+            if (MessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
+                reboot = TRUE;
             break;
         default:
@@ -335 +210 @@
             goto end;
     }
-    
+
     res = OK;
 end:
-    IpClose16(hInf);
+    tmp = VcpClose16(VCPFL_ALL, NULL);
+    if (tmp != OK)
+        res = tmp;
+    tmp = IpClose16(hInf);
+    if (tmp != OK)
+        res = tmp;
     SETUPX_FreeSubStrings(pSub);
     if (reboot)
@@ -497 +377 @@
 };
 
-/* 
+/*
  * LDD  == Logical Device Descriptor
  * LDID == Logical Device ID
  *
  * The whole LDD/LDID business might go into a separate file named
- * ldd.c or logdevice.c.
+ * ldd.c.
  * At the moment I don't know what the hell these functions are really doing.
  * That's why I added reporting stubs.
@@ -575 +455 @@
     if (hKey) RegCloseKey(hKey);
 }
-        
+
 /***********************************************************************
  * CtlDelLdd            (SETUPX.37)
@@ -613 +493 @@
         pFirstLDD = NULL;
     HeapFree(GetProcessHeap(), 0, pCurr);
-    
+
     return OK;
 }
@@ -634 +514 @@
  *   ERR_VCP_LDDINVALID if pldd->cbSize != structsize
  *   1 in all other cases ??
- * 
+ *
  */
 RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
@@ -641 +521 @@
 
     TRACE("(%p)\n", pldd);
-   
+
     if (!std_LDDs_done)
         SETUPX_CreateStandardLDDs();
@@ -661 +541 @@
     memcpy(pldd, pCurr->pldd, pldd->cbSize);
     /* hmm, we probably ought to strcpy() the string ptrs here */
-    
+
     return 1; /* what is this ?? */
 }
@@ -697 +577 @@
          pCurr = pCurr->next;
     }
-    if (pCurr == NULL) /* hit end of list */
+    if (!pCurr || pldd->ldid != pCurr->pldd->ldid)
     {
         is_new = TRUE;
@@ -716 +596 @@
 
     if (pldd->pszPath)
-        pCurrLDD->pszPath       = HEAP_strdupA(heap, 0, pldd->pszPath);
+    {
+        pCurrLDD->pszPath = HeapAlloc( heap, 0, strlen(pldd->pszPath)+1 );
+        strcpy( pCurrLDD->pszPath, pldd->pszPath );
+    }
     if (pldd->pszVolLabel)
-        pCurrLDD->pszVolLabel   = HEAP_strdupA(heap, 0, pldd->pszVolLabel);
+    {
+        pCurrLDD->pszVolLabel = HeapAlloc( heap, 0, strlen(pldd->pszVolLabel)+1 );
+        strcpy( pCurrLDD->pszVolLabel, pldd->pszVolLabel );
+    }
     if (pldd->pszDiskName)
-        pCurrLDD->pszDiskName   = HEAP_strdupA(heap, 0, pldd->pszDiskName);
+    {
+        pCurrLDD->pszDiskName = HeapAlloc( heap, 0, strlen(pldd->pszDiskName)+1 );
+        strcpy( pCurrLDD->pszDiskName, pldd->pszDiskName );
+    }
 
     if (is_new) /* link into list */
@@ -732 +621 @@
             pFirstLDD = pCurr;
     }
-    
+
     return OK;
 }
@@ -758 +647 @@
  * RETURN
  *   ERR_VCP_LDDINVALID if pldd->cbSize != structsize
- * 
+ *
  */
 static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
@@ -830 +719 @@
     LOGDISKDESC_S ldd;
     TRACE("(%d, '%s');\n", ldid, szPath);
-    
+
+    SetupSetDirectoryIdA( 0, ldid, szPath );
     INIT_LDD(ldd, ldid);
     ldd.pszPath = szPath;
     return CtlSetLdd16(&ldd);
 }
-
-/*
- * Find the value of a custom LDID in a .inf file
- * e.g. for 49301:
- * 49300,49301=ProgramFilesDir,5
- * -- profile section lookup -->
- * [ProgramFilesDir]
- * HKLM,"Software\Microsoft\Windows\CurrentVersion","ProgramFilesDir",,"%24%"
- * -- GenFormStrWithoutPlaceHolders16 -->
- * HKLM,"Software\Microsoft\Windows\CurrentVersion","ProgramFilesDir",,"C:\"
- * -- registry lookup -->
- * C:\Program Files (or C:\ if not found in registry)
- * 
- * FIXME:
- * - maybe we ought to add a caching array for speed ? - I don't care :)
- * - not sure whether the processing is correct - sometimes there are equal
- *   LDIDs for both install and removal sections.
- * - probably the whole function can be removed as installers add that on their
- *   own 
- */
-static BOOL SETUPX_AddCustomLDID(int ldid, INT16 hInf)
-{
-    char ldidstr[6];
-    LPSTR sectionbuf = NULL, entrybuf = NULL, regsectionbuf = NULL;
-    LPCSTR filename;
-    LPSTR pSec, pEnt, pEqual, p, *pSub = NULL;
-    BOOL ret = FALSE;
-    char buffer[MAX_PATH];
-    LOGDISKDESC_S ldd;
-
-    sprintf(ldidstr, "%d", ldid);
-    filename = IP_GetFileName(hInf);
-    if (!(sectionbuf = SETUPX_GetSections(filename)))
-    {
-        ERR("couldn't get sections !\n");
-        return FALSE;
-    }
-    for (pSec=sectionbuf; *pSec; pSec += strlen(pSec)+1)
-    {
-        if (!(entrybuf = SETUPX_GetSectionEntries(filename, pSec)))
-        {
-            ERR("couldn't get section entries !\n");
-            goto end;
-        }
-        for (pEnt=entrybuf; *pEnt; pEnt += strlen(pEnt)+1)
-        {
-            if (strstr(pEnt, ldidstr))
-            {
-                pEqual = strchr(pEnt, '=');
-                if (!pEqual) /* crippled entry ?? */
-                    continue;
-
-                /* make sure we found the LDID on left side of the equation */
-                if (pEnt+strlen(ldidstr) <= pEqual)
-                { /* found */
-
-                    /* but we don't want entries in the strings section */
-                    if (!strcasecmp(pSec, "Strings"))
-                        goto next_section;
-                    p = pEqual+1;
-                    goto found;
-                }
-            }
-        }
-next_section:
-    }
-    goto end;
-found:
-    TRACE("found entry '%s'\n", p);
-    pSub = SETUPX_GetSubStrings(p, ',');
-    if (*(DWORD *)pSub > 2)
-    {
-        ERR("malformed entry '%s' ?\n", p);
-        goto end;
-    }
-    TRACE("found section '%s'\n", *(pSub+1));
-    /* FIXME: what are the optional flags at the end of an entry used for ?? */
-
-    /* get the location of the registry key from that section */
-    if (!(regsectionbuf = SETUPX_GetSectionEntries(filename, *(pSub+1))))
-    {
-        ERR("couldn't get registry section entries !\n");
-        goto end;
-    }
-    /* sectionbuf is > 1024 bytes anyway, so use it */
-    GenFormStrWithoutPlaceHolders16(sectionbuf, regsectionbuf, hInf);
-    ret = SETUPX_LookupRegistryString(sectionbuf, buffer, MAX_PATH);
-    TRACE("return '%s'\n", buffer);
-    INIT_LDD(ldd, ldid);
-    ldd.pszPath = buffer;
-    CtlSetLdd16(&ldd);
-end:
-    SETUPX_FreeSubStrings(pSub);
-    if (sectionbuf)     HeapFree(GetProcessHeap(), 0, sectionbuf);
-    if (entrybuf)       HeapFree(GetProcessHeap(), 0, entrybuf);
-    if (regsectionbuf)  HeapFree(GetProcessHeap(), 0, regsectionbuf);
-    return ret;
-}
-
-/*
- * Translate a logical disk identifier (LDID) into its string representation
- * I'm afraid this can be totally replaced by CtlGetLddPath().
- */
-static BOOL SETUPX_IP_TranslateLDID(int ldid, LPSTR *p, HINF16 hInf)
-{
-    BOOL handled = FALSE;
-    LOGDISKDESC_S ldd;
-
-    ldd.cbSize = sizeof(LOGDISKDESC_S);
-    ldd.ldid = ldid;
-    if (CtlFindLdd16(&ldd) == ERR_VCP_LDDFIND)
-    {
-        /* hmm, it seems the installers already do the work for us
-         * (by calling CtlSetLddPath) that SETUPX_AddCustomLDID
-         * is supposed to do. Grmbl ;-)
-         * Well, I'll leave it here anyway, but print error... */
-        ERR("hmm, LDID %d not registered yet !?\n", ldid);
-        handled = SETUPX_AddCustomLDID(ldid, hInf);
-    }
-    else
-        handled = TRUE;
-    
-    SETUPX_GetLdd(&ldd);
-    
-    if (!handled)
-    {
-        FIXME("What is LDID %d ??\n", ldid);
-        *p = "LDID_FIXME";
-    }
-    else
-        *p = ldd.pszPath;
-
-    return handled;
-}
-
-/***********************************************************************
- *              GenFormStrWithoutPlaceHolders
- *
- * ought to be pretty much implemented, I guess...
- */
-void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR szDst, LPCSTR szSrc, HINF16 hInf)
-{
-    LPCSTR pSrc = szSrc, pSrcEnd = szSrc + strlen(szSrc);
-    LPSTR pDst = szDst, p, pPHBegin;
-    int count;
-    
-    TRACE("(%p, '%s', %04x);\n", szDst, szSrc, hInf);
-    while (pSrc < pSrcEnd)
-    {
-        p = strchr(pSrc, '%');
-        if (p)
-        {
-            count = (int)p - (int)pSrc;
-            strncpy(pDst, pSrc, count);
-            pSrc += count;
-            pDst += count;
-            pPHBegin = p+1;
-            p = strchr(pPHBegin, '%');
-            if (p)
-            {
-                char placeholder[80]; /* that really ought to be enough ;) */
-                int ldid;
-                BOOL done = TRUE;
-                count = (int)p - (int)pPHBegin;
-                strncpy(placeholder, pPHBegin, count);
-                placeholder[count] = '\0';
-                ldid = atoi(placeholder);
-                if (ldid)
-                {
-                    LPSTR p;
-                    done = SETUPX_IP_TranslateLDID(ldid, &p, hInf);
-                    strcpy(pDst, p);
-                    if (done)
-                        pDst += strlen(pDst);
-                }
-                else
-                { /* hmm, string placeholder. Need to look up
-                     in the [strings] section of the hInf */
-                    DWORD ret;
-                    char buf[256]; /* long enough ? */
-                    
-                    ret = GetPrivateProfileStringA("strings", placeholder, "",
-                                        buf, 256, IP_GetFileName(hInf));
-                    if (ret)
-                    {
-                        strcpy(pDst, buf);
-                        pDst += strlen(buf);
-                    }
-                    else
-                    {
-                        ERR("placeholder string '%s' not found !\n", placeholder);
-                        done = FALSE;
-                    }
-                }
-                if (!done)
-                { /* copy raw placeholder string over */
-                    count = (int)p - (int)pPHBegin + 2;
-                    strncpy(pDst, pPHBegin-1, count);
-                    pDst += count;
-                    
-                }
-                pSrc = p+1;
-                continue;
-            }
-        }
-
-        /* copy the remaining source string over */
-        strncpy(pDst, pSrc, (int)pSrcEnd - (int)pSrc + 1);
-        break;
-    }
-    TRACE("ret '%s'\n", szDst);
-}
-
-/***********************************************************************
- *              VcpOpen
- *
- * No idea what to do here.
- */
-RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef)
-{
-    FIXME("(%p, %08lx), stub.\n", vifproc, lparamMsgRef);
-    return OK;
-}
-
-/***********************************************************************
- *              VcpClose
- *
- * Is fl related to VCPDISKINFO.fl ?
- */
-RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
-{
-    FIXME("(%04x, '%s'), stub.\n", fl, lpszBackupDest);
-    return OK;
-}
-
-/*
- * Copy all items in a CopyFiles entry over to the destination
- *
- * - VNLP_xxx is what is given as flags for a .INF CopyFiles section
- */
-static BOOL SETUPX_CopyFiles(LPSTR *pSub, HINF16 hInf)
-{
-    BOOL res = FALSE;
-    unsigned int n;
-    LPCSTR filename = IP_GetFileName(hInf);
-    LPSTR pCopyEntry;
-    char pDestStr[MAX_PATH];
-    LPSTR pSrcDir, pDstDir;
-    LPSTR pFileEntries, p;
-    WORD ldid;
-    LOGDISKDESC_S ldd;
-    LPSTR *pSubFile;
-    LPSTR pSrcFile, pDstFile;
-
-    for (n=0; n < *(DWORD *)pSub; n++)
-    {
-        pCopyEntry = *(pSub+1+n);
-        if (*pCopyEntry == '@')
-        {
-            ERR("single file not handled yet !\n");
-            continue;
-        }
-
-        /* get source directory for that entry */
-        INIT_LDD(ldd, LDID_SRCPATH);
-        SETUPX_GetLdd(&ldd);
-        pSrcDir = ldd.pszPath;
-        
-        /* get destination directory for that entry */
-        if (!(GetPrivateProfileStringA("DestinationDirs", pCopyEntry, "",
-                                        pDestStr, sizeof(pDestStr), filename)))
-            continue;
-
-        /* translate destination dir if given as LDID */
-        ldid = atoi(pDestStr);
-        if (ldid)
-        {
-            if (!(SETUPX_IP_TranslateLDID(ldid, &pDstDir, hInf)))
-                continue;
-        }
-        else
-            pDstDir = pDestStr;
-        
-        /* now that we have the destination dir, iterate over files to copy */
-        pFileEntries = SETUPX_GetSectionEntries(filename, pCopyEntry);
-        for (p=pFileEntries; *p; p +=strlen(p)+1)
-        {
-            pSubFile = SETUPX_GetSubStrings(p, ',');
-            pSrcFile = *(pSubFile+1);
-            pDstFile = (*(DWORD *)pSubFile > 1) ? *(pSubFile+2) : pSrcFile;
-            TRACE("copying file '%s\\%s' to '%s\\%s'\n", pSrcDir, pSrcFile, pDstDir, pDstFile);
-            if (*(DWORD *)pSubFile > 2)
-            {
-                WORD flag;
-                if ((flag = atoi(*(pSubFile+3)))) /* ah, flag */
-                {
-                    if (flag & 0x2c)
-                    FIXME("VNLP_xxx flag %d not handled yet.\n", flag);
-                }
-                else
-                    FIXME("temp file name '%s' given. Need to register in wininit.ini !\n", *(pSubFile+3)); /* strong guess that this is VcpQueueCopy() */
-            }
-            SETUPX_FreeSubStrings(pSubFile);
-            /* we don't copy ANYTHING yet ! (I'm too lazy and want to verify
-             * this first before destroying whole partitions ;-) */
-        }
-    }
-            
-    return res;
-}
-
-/***********************************************************************
- *              GenInstall
- *
- * general install function for .INF file sections
- *
- * This is not perfect - patch whenever you can !
- * 
- * wFlags == GENINSTALL_DO_xxx
- * e.g. NetMeeting:
- * first call GENINSTALL_DO_REGSRCPATH | GENINSTALL_DO_FILES,
- * second call GENINSTALL_DO_LOGCONFIG | CFGAUTO | INI2REG | REG | INI
- */
-RETERR16 WINAPI GenInstall16(HINF16 hInfFile, LPCSTR szInstallSection, WORD wFlags)
-{
-    LPCSTR filename = IP_GetFileName(hInfFile);
-    LPSTR pEntries, p, pEnd;
-    DWORD len;
-    LPSTR *pSub;
-
-    FIXME("(%04x, '%s', %04x), semi-stub. Please implement additional operations here !\n", hInfFile, szInstallSection, wFlags);
-    pEntries = SETUPX_GetSectionEntries(filename, szInstallSection);
-    if (!pEntries)
-    {
-        ERR("couldn't find entries for section '%s' !\n", szInstallSection);
-        return ERR_IP_SECT_NOT_FOUND;
-    }
-    for (p=pEntries; *p; p +=strlen(p)+1)
-    {
-        pEnd = strchr(p, '=');
-        if (!pEnd) continue;
-        pSub = SETUPX_GetSubStrings(pEnd+1, ','); /* split entries after the '=' */
-        SETUPX_IsolateSubString(&p, &pEnd);
-        len = (int)pEnd - (int)p;
-
-        if (wFlags & GENINSTALL_DO_FILES)
-        {
-            if (!strncasecmp(p, "CopyFiles", len))
-            {
-                SETUPX_CopyFiles(pSub, hInfFile);
-                continue;
-            }
-#if IMPLEMENT_THAT
-            else
-            if (!strncasecmp(p, "DelFiles", len))
-            {
-                SETUPX_DelFiles(filename, szInstallSection, pSub);
-                continue;
-            }
-#endif
-        }
-        if (wFlags & GENINSTALL_DO_INI)
-        {
-#if IMPLEMENT_THAT
-            if (!strncasecmp(p, "UpdateInis", len))
-            {
-                SETUPX_UpdateInis(filename, szInstallSection, pSub);
-                continue;
-            }
-#endif
-        }
-        if (wFlags & GENINSTALL_DO_REG)
-        {
-#if IMPLEMENT_THAT
-            /* probably use SUReg*() functions here */
-            if (!strncasecmp(p, "AddReg", len))
-            {
-                SETUPX_AddReg(filename, szInstallSection, pSub);
-                continue;
-            }
-            else
-            if (!strncasecmp(p, "DelReg", len))
-            {
-                SETUPX_DelReg(filename, szInstallSection, pSub);
-                continue;
-            }
-#endif
-        }
-        
-        SETUPX_FreeSubStrings(pSub);
-    }
-    HeapFree(GetProcessHeap(), 0, pEntries);
-    return OK;
-}