Changeset 9957 for trunk/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Mar 31, 2003, 4:53:32 AM (22 years ago)

Author:

bird

Message:

Cleaned up Customb Dll handling, pluss exclude dll feature. Added support for all object RW.

File:

• trunk/src/win32k/pe2lx/pe2lx.cpp (modified) (19 diffs)

trunk/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.34 2001-10-15 20:46:20 sandervl Exp $
+/* $Id: pe2lx.cpp,v 1.35 2003-03-31 02:52:49 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1905 +1905 @@
      */
     rfree(pVars);
+    NOREF(lLibPath);
     return ERROR_FILE_NOT_FOUND;//ldrOpenPath(pachFilename, (USHORT)cchFilename, pLdrLv, pful, lLibPath);
 
@@ -2567 +2568 @@
                 paObjTab[i].o32_base     = ulImageBase + paObjects[i].ulRVA;
                 paObjTab[i].o32_flags    = paObjects[i].flFlags;
+                if (isAllRWObjectsEnabled())
+                    paObjTab[i].o32_flags = OBJREAD | OBJWRITE | OBJBIGDEF;
                 paObjTab[i].o32_pagemap  = ulPageMap;
                 paObjTab[i].o32_mapsize  = ALIGN(paObjTab[i].o32_size, PAGESIZE) >> PAGESHIFT;
@@ -2789 +2792 @@
     char                        szModuleName[128];
     #endif
+    char *                      pszModuleName;      /* Pointer to the current modulename or NULL. Only used with Custombuild. */
     ULONG                       ulRVAFirstThunk;    /* Current first thunk array RVA. Points at current entry. */
     ULONG                       ulRVAOrgFirstThunk; /* Current original first thunk array RVA. Points at current entry. */
@@ -2895 +2899 @@
     }
 
-    /* Make sure kernel32 is the first imported module */
-    if (rc == NO_ERROR) 
-    {
-        #ifndef RING0
-        if(hasCustomDll()) {
-            rc = addModule(options.pszCustomDll, (PULONG)SSToDS(&ul));
-            ulCustomModOrdinal = ul;
-            strcpy(szModuleName, "KERNEL32");
-        }
-        else
-        #endif
-            rc = addModule("KERNEL32.DLL", (PULONG)SSToDS(&ul));
-    }
+    /* Make sure kernel32/customdll is the first imported module */
+    #ifndef RING0
+    if (hasCustomDll())
+    {
+        rc = addModule(options.pszCustomDll, (PULONG)SSToDS(&ul));
+        ulCustomModOrdinal = ul;
+    }
+    else
+    #endif
+        rc = addModule("KERNEL32.DLL", (PULONG)SSToDS(&ul));
 
     /* initiate the import variables */
@@ -2937 +2938 @@
                 if (rc == NO_ERROR)
                 {
-                    #ifndef RING0
-                    if(hasCustomDll()) {
+                    pszModuleName = NULL;
+                    #ifdef RING0
+                    rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
+
+                    #else
+                    /* Uppercase the module names, and skip the extension. */
+                    if (hasCustomDll())
+                    {
+                        strcpy((pszModuleName = (char*)SSToDS(szModuleName)), psz);
                         ulModuleOrdinal = ulCustomModOrdinal;
-                        strcpy(szModuleName, psz);
-                        char *tmp = szModuleName;
-                        while(*tmp != 0 && *tmp != '.')
-                        {
-                            if(*tmp >= 'a' && *tmp <= 'z') {
-                                *tmp += ('A' - 'a');
-                            }
-                            tmp++;
-                        }
-                        *tmp = 0;
+                        for (char *pszTmp = pszModuleName; *pszTmp !='\0' && *pszTmp != '.'; pszTmp++)
+                            if (*pszTmp >= 'a' && *pszTmp <= 'z')
+                                *pszTmp += ('A' - 'a');
+                        *pszTmp = '\0';
                     }
-                    else
+                    if (!hasCustomDll() || isCustomDllExcluded(pszModuleName))
+                    {
+                        rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
+                        szModuleName[0] = '\0';
+                        pszModuleName = NULL;
+                    }
                     #endif
-                        rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
-
                     free(psz);
                 }
@@ -2990 +2995 @@
             && ((paObjects[iObj].Misc.offTIBFix + paObjects[iObj].ulRVA) & ~(PAGESIZE-1UL)) == ulRVAPage)
         {
+            PCSZ pszTmp = NULL;
             #ifndef RING0
-            if(hasCustomDll()) {
+            if (hasCustomDll())
+            {
+                pszTmp = "KERNEL32";
                 rc = addModule(options.pszCustomDll, (PULONG)SSToDS(&ul));
-                ulCustomModOrdinal = ul;
             }
             else
@@ -3004 +3011 @@
                                          ul,
                                          pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_DLL ?
-                                            ORD_REGISTERPE2LXDLL : ORD_REGISTERPE2LXEXE
-                #ifndef RING0
-                                         , "KERNEL32"
-                #endif
-                                         );
+                                            ORD_REGISTERPE2LXDLL : ORD_REGISTERPE2LXEXE, pszTmp);
             }
             if (rc != NO_ERROR)
@@ -3028 +3031 @@
                     if (Thunk.u1.Ordinal & (ULONG)IMAGE_ORDINAL_FLAG)
                         rc = add32OrdImportFixup((WORD)(ulRVAFirstThunk & (PAGESIZE-1)),
-                                                 ulModuleOrdinal, Thunk.u1.Ordinal & 0xffff
-                        #ifndef RING0
-                                                 , szModuleName
-                        #endif
-                                                 );
+                                                 ulModuleOrdinal, Thunk.u1.Ordinal & 0xffff, pszModuleName);
                     else if (Thunk.u1.Ordinal > 0UL && Thunk.u1.Ordinal < pNtHdrs->OptionalHeader.SizeOfImage)
                     {
@@ -3040 +3039 @@
                             break;
                         rc = add32NameImportFixup((WORD)(ulRVAFirstThunk & (PAGESIZE-1)),
-                                                  ulModuleOrdinal, psz
-                        #ifndef RING0
-                                                  , szModuleName
-                        #endif
-                                                 );
+                                                  ulModuleOrdinal, psz, pszModuleName);
                         free(psz);
                     }
@@ -3087 +3082 @@
                             if (rc == NO_ERROR)
                             {
-                                #ifndef RING0
-                                if(hasCustomDll()) {
+                                pszModuleName = NULL;
+                                #ifdef RING0
+                                rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
+
+                                #else
+                                if (hasCustomDll())
+                                {
+                                    strcpy((pszModuleName = (char*)SSToDS(szModuleName)), psz);
                                     ulModuleOrdinal = ulCustomModOrdinal;
-                                    strcpy(szModuleName, psz);
-                                    char *tmp = szModuleName;
-                                    while(*tmp != 0 && *tmp != '.') {
-                                        if(*tmp >= 'a' && *tmp <= 'z') {
-                                            *tmp += ('A' - 'a');
-                                        }
-                                        tmp++;
-                                    }
-                                    *tmp = 0;
+                                    for (char *pszTmp = pszModuleName; *pszTmp !='\0' && *pszTmp != '.'; pszTmp++)
+                                        if (*pszTmp >= 'a' && *pszTmp <= 'z')
+                                            *pszTmp += ('A' - 'a');
+                                    *pszTmp = '\0';
                                 }
-                                else
+                                if (!hasCustomDll() || isCustomDllExcluded(pszModuleName))
+                                {
+                                    rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
+                                    szModuleName[0] = '\0';
+                                    pszModuleName = NULL;
+                                }
                                 #endif
-                                    rc = addModule(psz, (PULONG)SSToDS(&ulModuleOrdinal));
                                 free(psz);
                             }
@@ -3851 +3851 @@
  * @param     ulFunctionOrdinal  Function ordinal. Number of the export which is to be imported from
  *                               the module given by ulModuleOrdinal.
+ * @param     pszModuleName      The name of the module or NULL. For custombuild only.
  * @sketch    IF not enough memory for the fixup THEN (try) allocate more memory
  *            Fill in fixup record.
@@ -3902 +3903 @@
  *
  */
-#ifndef RING0
-ULONG  Pe2Lx::add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal, PSZ pszModuleName)
-#else
-ULONG  Pe2Lx::add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal)
-#endif
+ULONG  Pe2Lx::add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal, PCSZ pszModuleName)
 {
     struct r32_rlc *prlc;
@@ -3912 +3909 @@
 
     #ifndef RING0
-    if(hasCustomDll() && pszModuleName)
-    {
-        char  searchstring[256];
-        char *found;
-
-        sprintf(searchstring, "%s.%d ", pszModuleName, ulFunctionOrdinal);
-        found = strstr(options.pszCustomExports, searchstring);
-        if(found) {
-            while(*found != '@') {
-                found++;
-            }
-            ulFunctionOrdinal = atoi(++found);
-        }
-        else {
-            printf("Error: Export %s not found in table.\n\n", searchstring);
+    if (pszModuleName != NULL && *pszModuleName && hasCustomDll() && !isCustomDllExcluded(pszModuleName))
+    {
+        /* Search for "DLL.EXPORT" in the translation file. */
+        char  szSearchString[256];
+        sprintf(szSearchString, "%s.%d ", pszModuleName, ulFunctionOrdinal);
+        const char * pszFound = strstr(options.pszCustomExports, szSearchString);
+        if (pszFound)
+        {
+            /* Following the DLL.EXPORT is a @ordinal. */
+            while (*pszFound != '@')
+                pszFound++;
+            return add32OrdImportFixup(offSource, ulModuleOrdinal, atoi(++pszFound), NULL);
+        }
+        else
+        {
+            printf("Error: Export %s not found in table.\n\n", szSearchString);
             return ERROR_MOD_NOT_FOUND;
         }
     }
+    #else
+    NOREF(pszModuleName);
     #endif
 
@@ -4000 +4000 @@
  * @param     ulModuleOrdinal  Module ordinal in the import module name table (1 based!)
  * @param     pszFnName        Pointer to a readonly function name for the imported function.
+ * @param     pszModuleName    The name of the module or NULL. For custombuild only.
  * @sketch    IF not enough memory for the fixup THEN (try) allocate more memory
  *            Add function name to the import procedure name table.
@@ -4052 +4053 @@
  *
  */
-#ifndef RING0
-ULONG  Pe2Lx::add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName, PSZ pszModuleName)
-#else
-ULONG  Pe2Lx::add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName)
-#endif
+ULONG  Pe2Lx::add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName, PCSZ pszModuleName)
 {
     APIRET          rc;
@@ -4064 +4061 @@
 
     #ifndef RING0
-    if(hasCustomDll())
-    {
-        char  searchstring[256];
-        char *found;
-        int   ordinal;
-
-        sprintf(searchstring, "%s.%s ", pszModuleName, pszFnName);
-        found = strstr(options.pszCustomExports, searchstring);
-        if(found) {
-            while(*found != '@') {
-                found++;
-            }
-            ordinal = atoi(++found);
-            return add32OrdImportFixup(offSource, ulModuleOrdinal, ordinal, NULL);
-        }
-        else {
-            printf("Error: Export %s not found in table.\n\n", searchstring);
+    if (pszModuleName != NULL && *pszModuleName && hasCustomDll() && !isCustomDllExcluded(pszModuleName))
+    {
+        /* Search for "DLL.EXPORT" in the translation file. */
+        char  szSearchString[256];
+        sprintf(szSearchString, "%s.%s ", pszModuleName, pszFnName);
+        const char * pszFound = strstr(options.pszCustomExports, szSearchString);
+        if (pszFound)
+        {
+            /* Following the DLL.EXPORT is a @ordinal. */
+            while (*pszFound != '@')
+                pszFound++;
+            return add32OrdImportFixup(offSource, ulModuleOrdinal, atoi(++pszFound), NULL);
+        }
+        else
+        {
+            printf("Error: Export %s not found in table.\n\n", szSearchString);
             return ERROR_MOD_NOT_FOUND;
         }
     }
+    #else
+    NOREF(pszModuleName);
     #endif
 
@@ -5133 +5131 @@
 PCSZ Pe2Lx::queryOdin32ModuleName(PCSZ pszWin32ModuleName)
 {
+    #ifndef RING0
+    if (hasCustomDll() && !isCustomDllExcluded(pszWin32ModuleName))
+        return pszWin32ModuleName;
+    #endif
+
     int i = 0;
-
-    #ifndef RING0
-    if(hasCustomDll()) {
-        return pszWin32ModuleName;
-    }
-    #endif
     while (paLieList[i].pszWin32Name != NULL)
     {
@@ -5149 +5146 @@
     return pszWin32ModuleName;
 }
+
+
+#ifndef RING0
+/**
+ * Checks if this DLL is excluded from the custombuild dll or not.
+ * @returns TRUE if excluded.
+ * @returns FALSE not excluded.
+ * @param   pszModuleName   DLL in question.
+ */
+BOOL Pe2Lx::isCustomDllExcluded(PCSZ pszModuleName)
+{
+    if (options.pszCustomDllExclude == NULL)
+        return FALSE;
+    if (!pszModuleName)
+        return TRUE;
+    const char *psz = strstr(options.pszCustomDllExclude, pszModuleName);
+    return (psz && psz[-1] == ';' && psz[strlen(pszModuleName)] == ';');
+}
+#endif