Changeset 4167 for trunk/src

Timestamp:

Sep 2, 2000, 11:14:50 PM (25 years ago)

Author:

bird

Message:

Optimizations for Win32k.sys.

Location:

trunk/src/kernel32

Files:

• initterm.cpp (modified) (5 diffs)
• makefile (modified) (3 diffs)
• winimagepe2lx.cpp (modified) (3 diffs)

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.44 2000-08-11 10:56:16 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.45 2000-09-02 21:14:50 bird Exp $ */
 
 /*
@@ -51 +51 @@
 #include "oslibdos.h"
 #include <cpuhlp.h>
-
-#define DBG_LOCALLOG    DBG_initterm
+#include <Win32k.h>
+
+#define DBG_LOCALLOG    DBG_initterm
 #include "dbglocal.h"
+
 
 /*-------------------------------------------------------------------*/
@@ -107 +109 @@
     {
         case 0 :
-        {
-            ParseLogStatus();
+        {
+            libWin32kInit();
+
+            ParseLogStatus();
 
             loadNr = globLoadNr++;
 
-            strcpy(kernel32Path, OSLibGetDllName(hModule));
-            char *endofpath = strrchr(kernel32Path, '\\');
-            *(endofpath+1) = 0;
+            strcpy(kernel32Path, OSLibGetDllName(hModule));
+            char *endofpath = strrchr(kernel32Path, '\\');
+            *(endofpath+1) = 0;
             dprintf(("kernel32 init\n"));
             _ctordtorInit();
@@ -120 +124 @@
             CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-            OpenPrivateLogFiles();
-
-            if(InitializeSharedHeap() == FALSE)
-                return 0UL;
-
-            if(InitializeCodeHeap() == FALSE)
+            OpenPrivateLogFiles();
+
+            if (InitializeSharedHeap() == FALSE)
+                return 0UL;
+
+            if (InitializeCodeHeap() == FALSE)
                 return 0UL;
 
             PROFILE_LoadOdinIni();
             dllHandle = RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab);
-            if(dllHandle == 0)
-                return 0UL;
-
-            //SvL: Kernel32 is a special case; pe.exe loads it, so increase
+            if (dllHandle == 0)
+                return 0UL;
+
+            //SvL: Kernel32 is a special case; pe.exe loads it, so increase
             //     the reference count here
-            Win32DllBase *module = Win32DllBase::findModule(dllHandle);
-            if(module) {
-                module->AddRef();
-                module->DisableUnload();
-            }
+            Win32DllBase *module = Win32DllBase::findModule(dllHandle);
+            if (module)
+            {
+                module->AddRef();
+                module->DisableUnload();
+            }
 
             /*******************************************************************/
@@ -156 +161 @@
                 flAllocMem = PAG_ANY;      // high memory support. Let's use it!
                 ulMaxAddr = ulSysinfo * (1024*1024);
-                OSLibInitWSeBFileIO();
+                OSLibInitWSeBFileIO();
             }
             else
                 flAllocMem = 0;        // no high memory support
 
-            OSLibDosSetInitialMaxFileHandles(ODIN_DEFAULT_MAX_FILEHANDLES);
+            OSLibDosSetInitialMaxFileHandles(ODIN_DEFAULT_MAX_FILEHANDLES);
 
             //SvL: Do it here instead of during the exe object creation
             //(std handles can be used in win32 dll initialization routines
             HMInitialize();             /* store standard handles within HandleManager */
-            InitializeTIB(TRUE);        //MUST be done after HMInitialize!
+            InitializeTIB(TRUE);    //MUST be done after HMInitialize!
             InitDirectories();
             RegisterDevices();
-            Win32DllBase::setDefaultRenaming();
+            Win32DllBase::setDefaultRenaming();
             rc = DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &ulSysinfo, sizeof(ulSysinfo));
-            if (rc != 0) 
-                ulSysinfo = 1;
+            if (rc != 0)
+                ulSysinfo = 1;
 
             InitSystemInfo(ulSysinfo);
-            //Set up environment as found in NT
+            //Set up environment as found in NT
             InitEnvironment(ulSysinfo);
             break;
-        }
+        }
+
         case 1 :
-            if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-            }
-            break;
+        if (dllHandle)
+        {
+            UnregisterLxDll(dllHandle);
+        }
+        break;
+
         default  :
             return 0UL;

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.97 2000-07-19 19:05:09 sandervl Exp $
+# $Id: makefile,v 1.98 2000-09-02 21:14:50 bird Exp $
 
 #
@@ -151 +151 @@
                           $(OBJDIR)\console.res
     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-    $(OS2RC) $(OBJDIR)\console.res $@
+    $(OS2RC) $(OS2RCLFLAGS) $(OBJDIR)\console.res $@
 
 
@@ -164 +164 @@
 $(PDWIN32_LIB)\LIBULS.LIB
 $(PDWIN32_LIB)\LIBCONV.LIB
+$(PDWIN32_LIB)\WIN32K.LIB
 OS2386.LIB
 $(RTLLIB_O)

trunk/src/kernel32/winimagepe2lx.cpp

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.13 2000-08-27 03:20:37 bird Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.14 2000-09-02 21:14:50 bird Exp $ */
 
 /*
@@ -33 +33 @@
 #include <win32type.h>
 #include <misc.h>
-#include <winimagebase.h>
-#include <winimagepe2lx.h>
+#include "winimagebase.h"
+#include "winimagepe2lx.h"
+#include "Win32k.h"
 
 #define DBG_LOCALLOG    DBG_winimagepe2lx
@@ -386 +387 @@
 {
     APIRET rc = NO_ERROR;
+
+    /*
+     * If Win32k.sys is installed we'll use it.
+     */
+    if (libWin32kInstalled())
+    {
+        ULONG           cbQte = sizeof(QOTEBUFFER) + sizeof(QOTE)*20;
+        PQOTEBUFFER     pQOte = (PQOTEBUFFER)malloc(sizeof(QOTEBUFFER) + sizeof(QOTE)*20);
+        if (pQOte != NULL)
+        {
+            /*
+             * Get the query OTEs for this module.
+             * If there is a buffer overflow we'll allocate more storage and retry.
+             */
+            rc = W32kQueryOTEs(hinstance, pQOte, cbQte);
+            while (rc == ERROR_BUFFER_OVERFLOW && cbQte < 32000);
+            {
+                PVOID pvOld = pQOte;
+                cbQte += sizeof(QOTE) * 20;
+                pQOte = (PQOTEBUFFER)realloc(pQOte, cbQte);
+                if (pQOte == NULL)
+                {
+                    free(pvOld);
+                    return ERROR_NOT_ENOUGH_MEMORY;
+                }
+
+                rc = W32kQueryOTEs(hinstance, pQOte, cbQte);
+            }
+
+            /*
+             * If successfully got the OTEs then allocate and set paSections structs.
+             */
+            if (rc == NO_ERROR)
+            {
+                /* Allocate memory for paSections */
+                paSections = (PSECTION)malloc(pQOte->cOTEs * sizeof(SECTION));
+                if (paSections != NULL)
+                {
+                    /* objects -> section array */
+                    for (int i = 0; i < pQOte->cOTEs; i++)
+                    {
+                        paSections[i].ulRVA = ~0UL;
+                        paSections[i].cbVirtual = pQOte->aOTE[i].ote_size;
+                        paSections[i].ulAddress = pQOte->aOTE[i].ote_base;
+                    }
+                    cSections = pQOte->cOTEs;
+                }
+                else
+                    rc = ERROR_NOT_ENOUGH_MEMORY;
+            }
+            else
+            {
+                dprintf(("Win32Pe2LxImage::getSections: libW32kQueryOTEs failed with rc=%d."
+                         " Falls back on the DosQuerySysState method.\n", rc));
+            }
+        }
+        else
+        {   /* server error, no use in trying the fallback method. */
+            dprintf(("Win32Pe2LxImage::getSections: malloc failed\n"));
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        if (rc == NO_ERROR)
+            return rc;
+    }
+
+
+    /*
+     * Fallback method, using DosQuerySysState.
+     */
     qsPtrRec_t *    pPtrRec;
     ULONG           cbBuf = 65536;