Changeset 8155

Timestamp:

Apr 1, 2002, 11:06:11 AM (23 years ago)

Author:

bird

Message:

At least it's compiling.

Location:

branches/splittup/src/win32k/src

Files:

• ModuleBase.cpp (modified) (2 diffs)
• Xx2Lx.mak (modified) (3 diffs)
• api.cpp (modified) (43 diffs)
• d32Win32kIOCtl.c (modified) (5 diffs)
• d32Win32kOpenClose.c (modified) (6 diffs)
• d32globals.c (modified) (2 diffs)
• d32init.c (modified) (9 diffs)
• elf2lx.cpp (modified) (5 diffs)
• k32AllocMemEx.cpp (modified) (8 diffs)
• k32HandleSystemEvent.cpp (modified) (6 diffs)
• k32KillProcessEx.cpp (modified) (6 diffs)
• k32ProcessReadWrite.cpp (modified) (8 diffs)
• k32QueryCallGate.cpp (modified) (5 diffs)
• k32QueryOTEs.cpp (modified) (6 diffs)
• k32QueryOptionsStatus.cpp (modified) (8 diffs)
• k32QuerySystemMemInfo.cpp (modified) (6 diffs)
• k32SendSystemEvent.cpp (modified) (7 diffs)
• k32SetEnvironment.cpp (modified) (7 diffs)
• k32SetOptions.cpp (modified) (8 diffs)
• ldr.cpp (modified) (28 diffs)
• mmf.cpp (modified) (2 diffs)
• myLDRGetProcAddr.cpp (modified) (5 diffs)
• myLDRQAppType.cpp (modified) (5 diffs)
• myVMAllocMem.cpp (modified) (3 diffs)
• myldrCheckInternalName.cpp (modified) (7 diffs)
• myldrClose.cpp (modified) (5 diffs)
• myldrEnum32bitRelRecs.cpp (modified) (5 diffs)
• myldrFindModule.cpp (modified) (14 diffs)
• myldrOpen.cpp (modified) (21 diffs)
• myldrOpenPath.cpp (modified) (7 diffs)
• myldrRead.cpp (modified) (5 diffs)
• myldrSetVMflags.cpp (modified) (5 diffs)
• myldrWasLoadModuled.cpp (modified) (5 diffs)
• pe2lx.cpp (modified) (21 diffs)
• xx2lxmain.cpp (modified) (3 diffs)

branches/splittup/src/win32k/src/ModuleBase.cpp ¶

@@ -1 @@
-/* $Id: ModuleBase.cpp,v 1.1.2.1 2002-03-31 20:09:03 bird Exp $
+/* $Id: ModuleBase.cpp,v 1.1.2.2 2002-04-01 09:06:02 bird Exp $
  *
  * ModuleBase - Implementetation.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: ModuleBase.cpp,v 1.1.2.2 2002-04-01 09:06:02 bird Exp $";
+#endif
 
 /*******************************************************************************

branches/splittup/src/win32k/src/Xx2Lx.mak ¶

@@ -1 @@
-# $Id: Xx2Lx.mak,v 1.1.2.1 2002-03-31 20:09:04 bird Exp $
+# $Id: Xx2Lx.mak,v 1.1.2.2 2002-04-01 09:06:02 bird Exp $
 
 #
-# Odin32 API
+# xx2lx makefile.
 #
-#       xx2lx.exe makefile
 #
 
 
 #
-# Tell buildenvironment that we're making an vio exe and to invoke additional dep rule
+# Load the build setup.
 #
-VIO=1
-EXETARGET=1
+PATH_ROOT = ..\..\..
+!include $(PATH_ROOT)\tools\make\setup.mak
 
 
 #
-# Compiler, tools, and interference rules thru the win32k makefile.inc file.
+# Config.
 #
-!include ..\..\makefile.inc
-!include makefile.inc
-
-
-#
-# Sanity check
-#
-!ifndef WIN32KINCLUDE
-!error "Fatal error! WIN32KINCLUDE is undefined!"
-!endif
-
-
-#
-# Tools and Flags Addjustments
-#
-CINCLUDES   = -I$(WIN32KINCLUDE) -I$(KKRNLLIBINCLUDE) $(CINCLUDES)
-CDEFINES    = $(CDEFINES) -DRING3 -DXX2LX
-!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
-CFLAGS      = $(CFLAGS)   -Ge+ -Gm- -Gn- -Ti+ -Rn     -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext-
-CXXFLAGS    = $(CXXFLAGS) -Ge+ -Gm- -Gn- -Ti+ -Rn -Gx -Wall+ppt-ppc-inl-cnv-gnr-vft-
-CLISTING    = -Fa$(OBJDIR)\$(@B).s
-COBJOUT     = -Fo$(OBJDIR)\$(@B).obj
-LD2FLAGS    = $(LD2FLAGS) /A:16 /Stack:4096
-!else
-!error  "Compiler is not yet supported."
-!endif
-
-
-#
-# Interference rules.
-#
-!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
-{$(WIN32KMISC)}.c.obj:
-    @echo compiling: $(@B).c
-    @$(CC)  $(CFLAGS)   $(CINCLUDES) $(CDEFINES) -c $(CLISTING) $(COBJOUT) $<
-
-{$(WIN32KMISC)}.cpp.obj:
-    @echo compiling: $(@B).cpp
-    @$(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $(CLISTING) $(COBJOUT) $<
-
-{$(WIN32KLDR)}.cpp.obj:
-    @echo compiling: $(@B).cpp
-    @$(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $(CLISTING) $(COBJOUT) $<
-
-{$(WIN32KPE2LX)}.cpp{$(OBJDIR)}.obj:
-    @echo compiling: $(@B).cpp
-    @$(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $(CLISTING) $(COBJOUT) $<
-
-{$(WIN32KELF2LX)}.cpp{$(OBJDIR)}.obj:
-    @echo compiling: $(@B).cpp
-    @$(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $(CLISTING) $(COBJOUT) $<
-
-!else
-!error  "Compiler is not yet supported."
-!endif
+TARGET_MODE  = EXE
+TARGET_NAME  = Xx2Lx
+MAKEFILE     = Xx2Lx.mak
+TARGET_STACKSIZE = 4096
+ALL_INCLUDES = -I../include -I../kKrnlLib/include
+ALL_DEFINES  = -DRING3 -DXX2LX -D__WIN32OS2__ -D__WINE__
+CC_FLAGS_EXE = $(CC_FLAGS_SYS) -URING0
 
 
@@ -78 +29 @@
 # Object files. Prefix with OBJDIR and one space before the '\'.
 #
-OBJS =\
-$(OBJDIR)\xx2lxmain.obj\
-$(OBJDIR)\modulebase.obj\
-$(OBJDIR)\pe2lx.obj\
-$(OBJDIR)\elf2lx.obj\
-$(OBJDIR)\malloc.obj\
-$(OBJDIR)\smalloc_avl.obj\
-$(OBJDIR)\avl.obj\
-$(OBJDIR)\rmalloc_avl.obj\
-$(OBJDIR)\new.obj\
-$(OBJDIR)\stricmp.obj\
-$(OBJDIR)\vprintf.obj
+TARGET_OBJS =\
+$(PATH_TARGET)\xx2lxmain.$(EXT_OBJ)\
+$(PATH_TARGET)\modulebase.$(EXT_OBJ)\
+$(PATH_TARGET)\pe2lx.$(EXT_OBJ)\
+$(PATH_TARGET)\elf2lx.$(EXT_OBJ)\
+#malloc.obj\
+#smalloc_avl.obj\
+#avl.obj\
+#rmalloc_avl.obj\
+#new.obj\
+#stricmp.obj\
+#vprintf.obj
 
 
@@ -95 +46 @@
 # Libraries. One space before the '\'.
 #
-LIBS = \
-$(RTLLIB_NRE) \
-os2386.lib
+TARGET_LIBS =\
+$(LIB_C_OBJ)\
+$(LIB_OS)\
 
 
 #
-# Target name - name of the exe without extention and path.
+# Load the build process rules.
 #
-TARGET = xx2lx
+!include $(MAKE_INCLUDE_PROCESS)
 
-
-#
-# Includes the common rules.
-#
-!include $(ODIN32_POST_INC)
-

branches/splittup/src/win32k/src/api.cpp ¶

@@ -1 @@
-/* $Id: api.cpp,v 1.1.2.1 2002-03-31 20:09:04 bird Exp $
+/* $Id: api.cpp,v 1.1.2.2 2002-04-01 09:06:02 bird Exp $
  *
  * API Overload Init and Helper Function.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: api.cpp,v 1.1.2.2 2002-04-01 09:06:02 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -118 +121 @@
 APIRET  apiReadIniFile(PSZ pszIniFile)
 {
+    KLOGENTRY1("APIRET","PSZ pszIniFile", pszIniFile);
     SFN     sfn;
     APIRET  rc;
@@ -172 +176 @@
         kprintf(("apiReadIniFile: Failed to open file %s, rc=%d\n", pszIniFile, rc));
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -187 +192 @@
 APIRET  apiParseIniFile(PSZ pszFile)
 {
+    KLOGENTRY1("APIRET","PSZ pszFile", pszFile);
     PAPIDATAENTRY   paNewApiData;
     PSZ *           ppszFile = (PSZ*)SSToDS(&pszFile);
@@ -199 +205 @@
     {
         kprintf(("apiParseIniFile: failed to allocate temporary struct.\n"));
+        KLOGEXIT(ERROR_NOT_ENOUGH_MEMORY);
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -304 +311 @@
     rfree(paNewApiData);
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -321 +329 @@
 PSZ     apiStripIniLine(PSZ pszFile, PSZ * ppszFile)
 {
+    KLOGENTRY2("PSZ","PSZ pszFile, PSZ * ppszFile", pszFile, ppszFile);
     PSZ     pszComment;
     PSZ     pszLine;
@@ -329 +338 @@
      */
     if (*pszFile)
+    {
+        KLOGEXIT(NULL);
         return NULL;
+    }
 
     /*
@@ -375 +387 @@
     pszComment[1] = '\0';
 
+    KLOGEXIT(pszLine);
     return pszLine;
 }
@@ -394 +407 @@
 int     apiInterpretApiNo(PSZ pszSection)
 {
+    KLOGENTRY1("int","PSZ pszSection", pszSection);
     int iApi = 0;
 
     pszSection++;                          /* skip '[' */
     if (*pszSection < '0' || *pszSection > '9')
+    {
+        KLOGEXIT(-1);
         return -1;
+    }
 
     while (*pszSection == ' ' || *pszSection == '\t')
@@ -409 +426 @@
     }
 
+    KLOGEXIT(iApi);
     return iApi;
 }
@@ -423 +441 @@
 void    apiSortApiData(PAPIDATAENTRY paApiData)
 {
+    KLOGENTRY1("void","PAPIDATAENTRY paApiData", paApiData);
     int i;
 
@@ -432 +451 @@
         apiSortMaskArray(&paApiData[i].ModuleExc);
     }
+    KLOGEXITVOID();
 }
 
@@ -447 +467 @@
 void    apiSortMaskArray(PMASKARRAY pMasks)
 {
+    KLOGENTRY1("void","PMASKARRAY pMasks", pMasks);
     int i;
     PSZ pszTmp;
@@ -469 +490 @@
         }
     } while (pszTmp != NULL);
+    KLOGEXITVOID();
 }
 
@@ -482 +504 @@
 void    apiFreeApiData(PAPIDATAENTRY paApiData)
 {
+    KLOGENTRY1("void","PAPIDATAENTRY paApiData", paApiData);
     int i;
 
@@ -495 +518 @@
             rfree(paApiData[i].ModuleExc.papszMasks);
     }
+    KLOGEXITVOID();
 }
 
@@ -510 +534 @@
 APIRET  apiWriteIniFile(PSZ pszIniFile)
 {
+    KLOGENTRY1("APIRET","PSZ pszIniFile", pszIniFile);
     SFN     sfn;
     APIRET  rc;
@@ -565 +590 @@
         kprintf(("apiWriteIniFile: Failed open %s for write. rc=%d\n", pszIniFile, rc));
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -584 +610 @@
 APIRET  apiWriteMasks(SFN sfn, PULONG poff, PMASKARRAY pMasks, PSZ pszType, BOOL fEnabled)
 {
+    KLOGENTRY5("APIRET","SFN sfn, PULONG poff, PMASKARRAY pMasks, PSZ pszType, BOOL fEnabled", sfn, poff, pMasks, pszType, fEnabled);
     char    sz[48];
     PSZ     psz = (PSZ)SSToDS(&sz[0]);
@@ -595 +622 @@
     rc = apiWriteLine(sfn, poff, psz);
     if (rc != NO_ERROR)
+    {
+        KLOGEXIT(rc);
         return rc;
+    }
 
     for (i = 0, rc = NO_ERROR; rc == NO_ERROR && i < pMasks->cMasks; i++)
         rc = apiWriteLine(sfn, poff, pMasks->papszMasks[i]);
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -617 +648 @@
 APIRET  apiWriteLine(SFN sfn, PULONG poff, PSZ pszString)
 {
+    KLOGENTRY3("APIRET","SFN sfn, PULONG poff, PSZ pszString", sfn, poff, pszString);
     ULONG   cb = strlen(pszString);
     APIRET  rc;
@@ -630 +662 @@
     }
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -651 +684 @@
     )
 {
+    KLOGENTRY5("APIRET","PSZ pszFilename, ULONG flOpenFlags, ULONG flOpenMode, PSFN phFile, PULONG pulsomething", pszFilename, flOpenFlags, flOpenMode, phFile, pulsomething);
     APIRET  rc;
     ULONG   ulAction = 0;
@@ -657 +691 @@
 
     pulsomething = pulsomething;
+    KLOGEXIT(rc);
     return rc;
 }
@@ -677 +712 @@
     ULONG ulOffset)
 {
+    KLOGENTRY5("APIRET","SFN hFile, PULONG pcbActual, PVOID pvBuffer, ULONG flFlags, ULONG ulOffset", hFile, pcbActual, pvBuffer, flFlags, ulOffset);
     APIRET  rc;
     ULONG   ul;
@@ -683 +719 @@
         rc = DosRead(hFile, pvBuffer, *pcbActual, pcbActual);
     flFlags = flFlags;
+    KLOGEXIT(rc);
     return rc;
 }
@@ -704 +741 @@
     ULONG ulOffset)
 {
+    KLOGENTRY5("APIRET","SFN hFile, PULONG pcbActual, PVOID pvBuffer, ULONG flFlags, ULONG ulOffset", hFile, pcbActual, pvBuffer, flFlags, ulOffset);
     APIRET  rc;
     ULONG   ul;
@@ -710 +748 @@
         rc = DosWrite(hFile, pvBuffer, *pcbActual, pcbActual);
     flFlags = flFlags;
+    KLOGEXIT(rc);
     return rc;
 }
@@ -723 +762 @@
     PULONG pcbFile)
 {
+    KLOGENTRY2("APIRET","SFN hFile, PULONG pcbFile", hFile, pcbFile);
     FILESTATUS3 fsts3;
     APIRET      rc;
@@ -729 +769 @@
     if (rc == NO_ERROR)
         *pcbFile = fsts3.cbFile;
+    KLOGEXIT(rc);
     return rc;
 }
@@ -747 +788 @@
 BOOL    apiFindNameInMaskArray(PSZ pszName, PMASKARRAY pMasks)
 {
+    KLOGENTRY2("BOOL","PSZ pszName, PMASKARRAY pMasks", pszName, pMasks);
+    KLOGEXIT(FALSE);
     return FALSE;
 }
@@ -767 +810 @@
 APIRET  apiGetProccessName(PSZ pszName)
 {
+    KLOGENTRY1("APIRET","PSZ pszName", pszName);
     PPTDA pPTDA = ptdaGetCur();
     if (pPTDA)
@@ -789 +833 @@
                 if (!psz) psz = psmte->smte_path;
                 strcpy(pszName, psz);
+                KLOGEXIT(NO_ERROR);
                 return NO_ERROR;
             }
@@ -800 +845 @@
         kprintf(("apiGetProcessName: No current PTDA!\n"));
 
+    KLOGEXIT(ERROR_INVALID_PARAMETER);
     return ERROR_INVALID_PARAMETER;
 }
@@ -819 +865 @@
 APIRET  apiGetModuleName(PSZ pszName, USHORT usCS, ULONG ulEIP)
 {
+    KLOGENTRY3("APIRET","PSZ pszName, USHORT usCS, ULONG ulEIP", pszName, usCS, ulEIP);
     HMTE hmte = VMGetOwner(usCS, ulEIP);
     if (hmte)
@@ -838 +885 @@
             if (!psz) psz = psmte->smte_path;
             strcpy(pszName, psz);
+            KLOGEXIT(NO_ERROR);
             return NO_ERROR;
         }
@@ -849 +897 @@
      * We failed.
      */
+    KLOGEXIT(ERROR_INVALID_PARAMETER);
     return ERROR_INVALID_PARAMETER;
 }
@@ -870 +919 @@
 BOOL _Optlink   APIQueryEnabled(int iApi, USHORT usCS, LONG ulEIP)
 {
+    KLOGENTRY3("BOOL","int iApi, USHORT usCS, LONG ulEIP", iApi, usCS, ulEIP);
     PAPIDATAENTRY   pEntry;
 
@@ -876 +926 @@
      */
     if (isApiEnhDisabled())
+    {
+        KLOGEXIT(FALSE);
         return FALSE;
+    }
 
     /*
@@ -925 +978 @@
     RWLockReleaseRead(&ApiInfoRWLock);
 
+    KLOGEXIT(fRet);
     return fRet;
 }
@@ -939 +993 @@
 APIRET _Optlink APIInit(void)
 {
+    KLOGENTRY0("APIRET");
     APIRET  rc;
 
     rc = apiReadIniFile(&szWin32kIni[0]);
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/d32Win32kIOCtl.c ¶

@@ -1 @@
-/* $Id: d32Win32kIOCtl.c,v 1.1.2.1 2002-03-31 20:09:06 bird Exp $
+/* $Id: d32Win32kIOCtl.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $
  *
  * Win32k driver IOCtl handler function.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: d32Win32kIOCtl.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $";
+#endif
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
@@ -16 +20 @@
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_TK
+#define INCL_KKL_LOG
 
 #define NO_WIN32K_LIB_FUNCTIONS
@@ -48 +53 @@
 USHORT _loadds _Far32 _Pascal Win32kIOCtl(PRP32GENIOCTL pRpIOCtl)
 {
+    KLOGENTRY1("USHORT","PRP32GENIOCTL pRpIOCtl", pRpIOCtl);
     /* validate parameter pointer */
     if (pRpIOCtl == NULL || pRpIOCtl->ParmPacket == NULL
         || pRpIOCtl->Function == 0 || pRpIOCtl->Function > K32_LASTIOCTLFUNCTION)
+    {
+        KLOGEXIT(STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER);
         return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+    }
 
     switch (pRpIOCtl->Category)
@@ -60 +69 @@
             if (    rc != 0xdeadbeefUL
                 &&  TKSuULongNF(&((PK32HDR)pRpIOCtl->ParmPacket)->rc, SSToDS(&rc)) == NO_ERROR)
+            {
+                KLOGEXIT(STATUS_DONE);
                 return STATUS_DONE;     /* Successfull return */
+            }
             break;
             }
     }
 
+    KLOGEXIT(STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER);
     return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
 }

branches/splittup/src/win32k/src/d32Win32kOpenClose.c ¶

@@ -1 @@
-/* $Id: d32Win32kOpenClose.c,v 1.1.2.1 2002-03-31 20:09:06 bird Exp $
+/* $Id: d32Win32kOpenClose.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $
  *
  * Open and Close handlers for the Win32k driver.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: d32Win32kOpenClose.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $";
+#endif
 
 
@@ -54 +57 @@
 USHORT _loadds _Far32 _Pascal Win32kOpen(PRP32OPENCLOSE pRpOpen)
 {
+    KLOGENTRY1("USHORT","PRP32OPENCLOSE pRpOpen", pRpOpen);
     APIRET  rc;
     PPTD    pptd;
@@ -73 +77 @@
     pRpOpen = pRpOpen;
     LDRClearSem();
+    KLOGEXIT(STATUS_DONE);
     return STATUS_DONE;
 }
@@ -86 +91 @@
 USHORT _loadds _Far32 _Pascal Win32kClose(PRP32OPENCLOSE pRpClose)
 {
+    KLOGENTRY1("USHORT","PRP32OPENCLOSE pRpClose", pRpClose);
     APIRET  rc;
     PPTD    pptd;
@@ -110 +116 @@
 
     LDRClearSem();
+    KLOGEXIT(STATUS_DONE);
     return STATUS_DONE;
 }

branches/splittup/src/win32k/src/d32globals.c ¶

@@ -1 @@
-/* $Id: d32globals.c,v 1.1.2.1 2002-03-31 20:09:07 bird Exp $
+/* $Id: d32globals.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $
  *
  * d32globals - global data (32-bit)
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: d32globals.c,v 1.1.2.2 2002-04-01 09:06:03 bird Exp $";
+#endif
 
 /*******************************************************************************

branches/splittup/src/win32k/src/d32init.c ¶

@@ -1 @@
-/* $Id: d32init.c,v 1.1.2.1 2002-03-31 20:09:07 bird Exp $
+/* $Id: d32init.c,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: d32init.c,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -49 +52 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
- ULONG          readnum(const char *pszNum);
+ULONG          readnum(const char *pszNum);
 
 
@@ -68 +71 @@
 ULONG _System R0Init(RP32INIT *pRpInit)
 {
+    KLOGENTRY1("ULONG _System","RP32INIT * pRpInit", pRpInit);
     char *      pszTmp2;
     char *      pszTmp;
@@ -266 +270 @@
     /* loader */
     if ((rc = ldrInit()) != NO_ERROR)
+    {
+        KLOGEXIT(rc);
         return rc;
+    }
 
     /* apis */
     #if 0
     if ((rc = APIInit()) != NO_ERROR)
+    {
+        KLOGEXIT(rc);
         return rc;
+    }
     #endif
 
@@ -279 +289 @@
     {
         kprintf(("R0Init32: InitCallGate failed with rc=%d\n", rc));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -305 +316 @@
         kprintf(("data segment lock failed with with rc=%d\n", rc));
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }
@@ -318 +330 @@
 ULONG    readnum(const char *pszNum)
 {
+    KLOGENTRY1("ULONG","const char * pszNum", pszNum);
     ULONG ulRet = 0;
     ULONG ulBase = 10;
@@ -349 +362 @@
     }
 
+    KLOGEXIT(i > 0 ? ulRet : ~0UL);
     return i > 0 ? ulRet : ~0UL;
 }

branches/splittup/src/win32k/src/elf2lx.cpp ¶

@@ -1 @@
-/* $Id: elf2lx.cpp,v 1.1.2.1 2002-03-31 20:09:08 bird Exp $
+/* $Id: elf2lx.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $
  *
  * Elf2Lx - implementation.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: elf2lx.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $";
+#endif
 
 
@@ -16 +19 @@
 #define INCL_DOSERRORS                  /* DOS Error codes. */
 #define INCL_OS2KRNL_LDR                /* LdrRead */
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 #ifdef RING0
     #define INCL_NOAPI                  /* RING0: No apis. */
@@ -27 +33 @@
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
-#include "types.h"                      /* Types used by the next two files. */
-#include <newexe.h>                     /* OS/2 NE structs and definitions. */
-#include <exe386.h>                     /* OS/2 LX structs and definitions. */
-#include "elf.h"                        /* Elf binary format definitions. */
-
-#include "devSegDf.h"                   /* Win32k segment definitions. */
-
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
+
+#include "NEexe.h"                      /* Wine NE structs and definitions. */
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "ELFexe.h"                     /* Elf binary format definitions. */
+#include <OS2Krnl.h>                    /* kernel structs.  (SFN) */
+#include <kKrnlLib.h>
 
 #include <string.h>                     /* C library string.h. */
@@ -43 +45 @@
 #include <stdarg.h>                     /* C library stdarg.h. */
 
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
-
 #include "modulebase.h"                 /* ModuleBase class definitions, ++. */
 #include "elf2lx.h"                     /* Elf2Lx class definitions.  */

branches/splittup/src/win32k/src/k32AllocMemEx.cpp ¶

@@ -1 @@
-/* $Id: k32AllocMemEx.cpp,v 1.1.2.1 2002-03-31 20:09:08 bird Exp $
+/* $Id: k32AllocMemEx.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $
  *
  * k32AllocMemEx - Equivalent to DosAllocMem, but this one
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32AllocMemEx.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $";
+#endif
 
 
@@ -106 +109 @@
 APIRET k32AllocMemEx(PPVOID ppv, ULONG cb, ULONG flFlags, ULONG ulCS, ULONG ulEIP)
 {
+    KLOGENTRY5("APIRET","PPVOID ppv, ULONG cb, ULONG flFlags, ULONG ulCS, ULONG ulEIP", ppv, cb, flFlags, ulCS, ulEIP);
     APIRET  rc;
     ULONG   flVMFlags;
@@ -137 +141 @@
     {
         kprintf(("k32AllocMemEx: Bad param (1)\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -144 +149 @@
     {
         kprintf(("k32AllocMemEx: Bad size cb=%d\n", cb));
+        KLOGEXIT(ERROR_NOT_ENOUGH_MEMORY);
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -153 +159 @@
         {
             kprintf(("k32AllocMemEx: Failed to fetch *ppv. rc=%d\n", rc));
+            KLOGEXIT(rc);
             return rc;
         }
@@ -162 +169 @@
         {
             kprintf(("k32AllocMemEx: *ppv has an invalid address. *ppv=0x%08x\n", vmac.ac_va));
+            KLOGEXIT(ERROR_INVALID_ADDRESS);
             return ERROR_INVALID_ADDRESS;
         }
@@ -243 +251 @@
 
     kprintf(("k32AllocMemEx: returns rc=%d (*ppv=0x%08x)\n", rc, vmac.ac_va));
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32HandleSystemEvent.cpp ¶

@@ -1 @@
-/* $Id: k32HandleSystemEvent.cpp,v 1.1.2.1 2002-03-31 20:09:09 bird Exp $
+/* $Id: k32HandleSystemEvent.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $
  *
  * k32HandleSystemEvent - Override system events like Ctrl-Alt-Delete
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32HandleSystemEvent.cpp,v 1.1.2.2 2002-04-01 09:06:04 bird Exp $";
+#endif
 
 
@@ -88 +91 @@
 APIRET k32HandleSystemEvent(ULONG ulEvent, HEV hev, BOOL fHandle)
 {
+    KLOGENTRY3("APIRET","ULONG ulEvent, HEV hev, BOOL fHandle", ulEvent, hev, fHandle);
     /*
      * Validate parameters.
@@ -96 +100 @@
         ||  ((ULONG)hev & 0xFFFF0000UL) != 0x80010000UL /* 0x80010000 seems to be the shared event semaphore handle bits. */
         )
+    {
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
+    }
 
 
@@ -105 +112 @@
         ||  (!fHandle && aSysEventsOverrides[ulEvent].hev != hev && !aSysEventsOverrides[ulEvent].fBad)
         )
+    {
+        KLOGEXIT(ERROR_ACCESS_DENIED);
         return ERROR_ACCESS_DENIED;
+    }
 
 
@@ -121 +131 @@
     }
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }

branches/splittup/src/win32k/src/k32KillProcessEx.cpp ¶

@@ -1 @@
-/* $Id: k32KillProcessEx.cpp,v 1.1.2.1 2002-03-31 20:09:09 bird Exp $
+/* $Id: k32KillProcessEx.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $
  *
  * k32KillProcessEx - DosKillProcessEx extention.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32KillProcessEx.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $";
+#endif
 
 
@@ -54 +57 @@
 APIRET k32KillProcessEx(ULONG flAction, PID pid)
 {
+    KLOGENTRY2("APIRET","ULONG flAction, PID pid", flAction, pid);
     APIRET  rc;
 
@@ -63 +67 @@
     {
         kprintf(("k32KillProcessEx(flAction=0x%08x, pid=0x%04x): flags are invalid\n", flAction, pid));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -70 +75 @@
     {
         kprintf(("k32KillProcessEx(flAction=0x%08x, pid=0x%04x): pid is out of range\n", flAction, pid));
+        KLOGEXIT(ERROR_INVALID_PROCID);
         return ERROR_INVALID_PROCID;
     }
@@ -94 +100 @@
     }
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32ProcessReadWrite.cpp ¶

@@ -1 @@
-/* $Id: k32ProcessReadWrite.cpp,v 1.1.2.1 2002-03-31 20:09:09 bird Exp $
+/* $Id: k32ProcessReadWrite.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $
  *
  * k32ProcessReadWrite  -  Read or write to another process.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32ProcessReadWrite.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $";
+#endif
 
 
@@ -53 +56 @@
 APIRET k32ProcessReadWrite(PID pid, ULONG cb, PVOID pvSource, PVOID pvTarget, BOOL fRead)
 {
+    KLOGENTRY5("APIRET","PID pid, ULONG cb, PVOID pvSource, PVOID pvTarget, BOOL fRead", pid, cb, pvSource, pvTarget, fRead);
     ULONG   ulAddrAlias;
     ULONG   cbAlias;
@@ -66 +70 @@
     cbAlias = (cb + 0xfffUL) & ~0xfffUL;
     if (cbAlias - 1 + ulAddrAlias < ulAddrAlias)
+    {
+        KLOGEXIT(ERROR_INVALID_ACCESS);
         return ERROR_INVALID_ACCESS;
+    }
 
     /*
@@ -78 +85 @@
     {
         kprintf(("k32ProcessReadWrite: Failed with invalid PID.\n"));
+        KLOGEXIT(rc != NO_ERROR ? rc : ERROR_INVALID_PARAMETER);
         return rc != NO_ERROR ? rc : ERROR_INVALID_PARAMETER;
     }
@@ -88 +96 @@
     {
         kprintf(("k32ProcessReadWrite: LDRRequestSem failed with rc=%d\n", rc));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -103 +112 @@
     {
         kprintf(("k32ProcessReadWrite: VMMapDebugAlias failed with rc=%d\n"));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -129 +139 @@
         kprintf(("k32ProcessReadWrite: VMFreeMem failed!\n"));
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32QueryCallGate.cpp ¶

@@ -1 @@
-/* $Id: k32QueryCallGate.cpp,v 1.1.2.1 2002-03-31 20:09:10 bird Exp $
+/* $Id: k32QueryCallGate.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $
  *
  * k32QueryCallGate - Query the callgate selector for the callgate to the k32 APIs.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32QueryCallGate.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $";
+#endif
 
 
@@ -16 +19 @@
 #define INCL_DOSERRORS
 #define INCL_OS2KRNL_TK
+#define INCL_KKL_LOG
 
 #define NO_WIN32K_LIB_FUNCTIONS
@@ -51 +55 @@
 APIRET k32QueryCallGate(PUSHORT pusCGSelector)
 {
+    KLOGENTRY1("APIRET","PUSHORT pusCGSelector", pusCGSelector);
     APIRET  rc;
 
@@ -58 +63 @@
         rc = ERROR_INVALID_CALLGATE;
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32QueryOTEs.cpp ¶

@@ -1 @@
-/* $Id: k32QueryOTEs.cpp,v 1.1.2.1 2002-03-31 20:09:10 bird Exp $
+/* $Id: k32QueryOTEs.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $
  *
  * k32QueryOTEs  -  Get's the object table entries (OTEs) for a given
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32QueryOTEs.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $";
+#endif
 
 
@@ -49 +52 @@
 APIRET k32QueryOTEs(HMTE hMTE, PQOTEBUFFER pQOte, ULONG cbQOte)
 {
+    KLOGENTRY3("APIRET","HMTE hMTE, PQOTEBUFFER pQOte, ULONG cbQOte", hMTE, pQOte, cbQOte);
     APIRET  rc;
     PMTE    pMTE;
@@ -58 +62 @@
      */
     if ((ULONG)pQOte < 0x10000 || cbQOte < sizeof(QOTEBUFFER))
+    {
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
+    }
 
     /*
@@ -67 +74 @@
     {
         kprintf(("k32QueryOTEs: LDRRequestSem failed with rc = %d\n", rc));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -115 +123 @@
     LDRClearSem();
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32QueryOptionsStatus.cpp ¶

@@ -1 @@
-/* $Id: k32QueryOptionsStatus.cpp,v 1.1.2.1 2002-03-31 20:09:11 bird Exp $
+/* $Id: k32QueryOptionsStatus.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $
  *
  * k32QueryOptionsStatus  - Queries the options and/or the status of
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32QueryOptionsStatus.cpp,v 1.1.2.2 2002-04-01 09:06:05 bird Exp $";
+#endif
 
 
@@ -30 +33 @@
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
-#include <peexe.h>                      /* Wine PE structs and definitions. */
-#include <neexe.h>                      /* Wine NE structs and definitions. */
-#include <newexe.h>                     /* OS/2 NE structs and definitions. */
-#include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <NEexe.h>                      /* Wine NE structs and definitions. */
+#include <LXexe.h>                      /* OS/2 LX structs and definitions. */
+#include <PEexe.h>                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -68 +70 @@
 APIRET k32QueryOptionsStatus(PK32OPTIONS pOptions, PK32STATUS pStatus)
 {
+    KLOGENTRY2("APIRET","PK32OPTIONS pOptions, PK32STATUS pStatus", pOptions, pStatus);
     APIRET  rc;
     ULONG   cb;
@@ -88 +91 @@
         rc = TKFuULongNF(SSToDS(&cb), &pOptions->cb);
         if (rc)
+        {
+            KLOGEXIT(rc);
             return rc;
+        }
         if (cb != sizeof(K32OPTIONS))
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
             return ERROR_INVALID_PARAMETER;
+        }
     }
 
@@ -97 +106 @@
         rc = TKFuULongNF(SSToDS(&cb), &pStatus->cb);
         if (rc)
+        {
+            KLOGEXIT(rc);
             return rc;
+        }
         if (cb != sizeof(K32STATUS))
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
             return ERROR_INVALID_PARAMETER;
+        }
     }
 
@@ -110 +125 @@
     {
         kprintf(("k32QueryOptionsStatus: LDRRequestSem failed with rc = %d\n", rc));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -216 +232 @@
     LDRClearSem();
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32QuerySystemMemInfo.cpp ¶

@@ -1 @@
-/* $Id: k32QuerySystemMemInfo.cpp,v 1.1.2.1 2002-03-31 20:09:11 bird Exp $
+/* $Id: k32QuerySystemMemInfo.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $
  *
  * k32QuerySystemMemInfo - Collects more or less useful information on the
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32QuerySystemMemInfo.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $";
+#endif
 
 
@@ -31 +34 @@
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
-#include <peexe.h>                      /* Wine PE structs and definitions. */
-#include <neexe.h>                      /* Wine NE structs and definitions. */
-#include <newexe.h>                     /* OS/2 NE structs and definitions. */
-#include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -62 +63 @@
 APIRET k32QuerySystemMemInfo(PK32SYSTEMMEMINFO pMemInfo)
 {
+    KLOGENTRY1("APIRET","PK32SYSTEMMEMINFO pMemInfo", pMemInfo);
     APIRET              rc;
     K32SYSTEMMEMINFO    MemInfo;
@@ -75 +77 @@
     rc = TKFuBuff(SSToDS(&MemInfo.cb), &pMemInfo->cb, sizeof(ULONG)*2, TK_FUSU_NONFATAL);
     if (rc)
+    {
+        KLOGEXIT(rc);
         return rc;
+    }
     if (MemInfo.cb != sizeof(K32SYSTEMMEMINFO))
+    {
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
+    }
     if (MemInfo.flFlags > 7)
+    {
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
+    }
 
 
@@ -161 +172 @@
         kprintf(("k32QuerySystemMemInfo: Failed to copy meminfo to user memory. rc=%d\n", rc));
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32SendSystemEvent.cpp ¶

@@ -1 @@
-/* $Id: k32SendSystemEvent.cpp,v 1.1.2.1 2002-03-31 20:09:12 bird Exp $
+/* $Id: k32SendSystemEvent.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $
  *
  * k32SendSystemEvent - Send a system event like Ctrl-Alt-Delete
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32SendSystemEvent.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $";
+#endif
 
 
@@ -16 +19 @@
 #define INCL_DOSMEMMGR
 #define INCL_DOSERRORS
-
 #define INCL_OS2KRNL_TK
 #define INCL_OS2KRNL_SEM
-
+#define INCL_KKL_LOG
 #define NO_WIN32K_LIB_FUNCTIONS
 
@@ -58 +60 @@
 APIRET k32SendSystemEvent(ULONG ulEvent, BOOL fHandle)
 {
+    KLOGENTRY2("APIRET","ULONG ulEvent, BOOL fHandle", ulEvent, fHandle);
     /*
      * Validate parameters.
@@ -66 +69 @@
         ||  ((ULONG)hev & 0xFFFF0000UL) != 0x80010000UL /* 0x80010000 seems to be the shared event semaphore handle bits. */
         )
+    {
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
+    }
 
 
@@ -75 +81 @@
         ||  (!fHandle && aSysEventsOverrides[ulEvent].hev != hev && !aSysEventsOverrides[ulEvent].fBad)
         )
+    {
+        KLOGEXIT(ERROR_ACCESS_DENIED);
         return ERROR_ACCESS_DENIED;
+    }
 
 
@@ -91 +100 @@
     }
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }

branches/splittup/src/win32k/src/k32SetEnvironment.cpp ¶

@@ -1 @@
-/* $Id: k32SetEnvironment.cpp,v 1.1.2.1 2002-03-31 20:09:13 bird Exp $
+/* $Id: k32SetEnvironment.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $
  *
  * k32SetEnvironment - Sets the Odin32 environment for a process.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32SetEnvironment.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $";
+#endif
 
 
@@ -56 +59 @@
 APIRET k32SetEnvironment(PSZ pszzEnvironment, ULONG cchEnvironment, PID pid)
 {
+    KLOGENTRY3("APIRET","PSZ pszzEnvironment, ULONG cchEnvironment, PID pid", pszzEnvironment, cchEnvironment, pid);
     APIRET  rc;
     PPTD    pptd;
@@ -65 +69 @@
     {
         kprintf(("k32SetEnvironment: invalid pid=%x\n", pid));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -71 +76 @@
     {
         kprintf(("k32SetEnvironment: currently only supported for current pid. pid=%x\n", pid));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -82 +88 @@
     {
         kprintf(("k32SetEnvironment: LDRRequestSem failed with rc = %d\n", rc));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -120 +127 @@
 
     LDRClearSem();
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/k32SetOptions.cpp ¶

@@ -1 @@
-/* $Id: k32SetOptions.cpp,v 1.1.2.1 2002-03-31 20:09:13 bird Exp $
+/* $Id: k32SetOptions.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $
  *
  * k32SetOptions - Sets the changable options of win32k.sys the options.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: k32SetOptions.cpp,v 1.1.2.2 2002-04-01 09:06:06 bird Exp $";
+#endif
 
 
@@ -28 +31 @@
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
-#include <peexe.h>                      /* Wine PE structs and definitions. */
-#include <neexe.h>                      /* Wine NE structs and definitions. */
-#include <newexe.h>                     /* OS/2 NE structs and definitions. */
-#include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -65 +66 @@
 APIRET k32SetOptions(PK32OPTIONS pOptions)
 {
+    KLOGENTRY1("APIRET","PK32OPTIONS pOptions", pOptions);
     APIRET  rc;
     ULONG   cb;
@@ -80 +82 @@
         rc = TKFuULongNF(SSToDS(&cb), &pOptions->cb);
         if (rc)
+        {
+            KLOGEXIT(rc);
             return rc;
+        }
         if (cb != sizeof(K32OPTIONS))
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
             return ERROR_INVALID_PARAMETER;
     }
@@ -102 +108 @@
             &&  TmpOptions.usCom != OUTPUT_COM3
             &&  TmpOptions.usCom != OUTPUT_COM4)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         #endif
         if (TmpOptions.fLogging > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fPE > 4)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fPEOneObject > 2)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.ulInfoLevel > 4)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fElf > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fUNIXScript > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fREXXScript > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fJava > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fNoLoader > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fREXXScript > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fDllFixes > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fExeFixes > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fForcePreload > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.fApiEnh > 1)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         #if 0
         if (TmpOptions.cbSwpHeapMax > (32768*1024) || TmpOptions.cbSwpHeapMax < options.cbSwpHeapInit)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         if (TmpOptions.cbResHeapMax > (32768*1024) || TmpOptions.cbResHeapMax < options.cbResHeapInit)
-            return ERROR_INVALID_PARAMETER;
+        {
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
+            return ERROR_INVALID_PARAMETER;
+        }
         #endif
 
@@ -146 +203 @@
         {
             kprintf(("k32QueryOptionsStatus: LDRRequestSem failed with rc = %d\n", rc));
+            KLOGEXIT(rc);
             return rc;
         }
@@ -183 +241 @@
     }
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/ldr.cpp ¶

@@ -1 @@
-/* $Id: ldr.cpp,v 1.1.2.1 2002-03-31 20:09:14 bird Exp $
+/* $Id: ldr.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $
  *
  * ldr.cpp - Loader helpers.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: ldr.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +28 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -87 +90 @@
 PMODULE     getModuleBySFN(SFN hFile)
 {
-    return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)hFile);
+    KLOGENTRY1("PMODULE","SFN hFile", hFile);
+    PMODULE pMod = (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)hFile);
+    KLOGEXIT(pMod);
+    return pMod;
 }
 
@@ -113 +119 @@
 PMODULE     getModuleByMTE(PMTE pMTE)
 {
+    KLOGENTRY1("PMODULE","PMTE pMTE", pMTE);
     #if 0
         /* Not 100% sure that this will work correctly! */
@@ -122 +129 @@
                 {
                     kprintf(("getModuleByMTE: invalid pMTE pointer - %#8x\n", pMTE));
+                    KLOGEXIT(NULL);
                     return NULL;
                 }
@@ -135 +143 @@
         else
             pMod = (PMODULE)((unsigned)pMod - offsetof(MODULE, coreMTE));
+    {
+        KLOGEXIT(pMod);
         return pMod;
+    }
     #else
         /* Use this for the time being. */
@@ -142 +153 @@
             {
                 kprintf(("getModuleByMTE: invalid pMTE pointer - %#8x\n", pMTE));
+                KLOGEXIT(NULL);
                 return NULL;
             }
         #endif
         if (GetState(pMTE->mte_sfn) == HSTATE_OUR)
-            return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
-
+        {
+            PMODULE pMod = (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
+            KLOGEXIT(pMod);
+            return pMod;
+        }
+
+        KLOGEXIT(NULL);
         return NULL;
     #endif
@@ -164 +181 @@
 PMODULE     getModuleByhMTE(HMTE hMTE)
 {
+    KLOGENTRY1("PMODULE","HMTE hMTE", hMTE);
     PMTE pMTE;
 
     pMTE = ldrValidateMteHandle(hMTE);
     if (pMTE != NULL)
-        return getModuleByMTE(pMTE);
-
+    {
+        PMODULE pMod = getModuleByMTE(pMTE);
+        KLOGEXIT(pMod);
+        return pMod;
+    }
+
+    KLOGEXIT(NULL);
     return NULL;
 }
@@ -184 +207 @@
 PMODULE     getModuleByFilename(PCSZ pszFilename)
 {
+    KLOGENTRY1("PMODULE","PCSZ pszFilename", pszFilename);
     pszFilename = pszFilename;
+    KLOGEXIT(NULL);
     return NULL;
 }
@@ -207 +232 @@
 ULONG       addModule(SFN hFile, PMTE pMTE, ULONG fFlags, ModuleBase *pModObj)
 {
+    KLOGENTRY4("ULONG","SFN hFile, PMTE pMTE, ULONG fFlags, ModuleBase * pModObj", hFile, pMTE, fFlags, pModObj);
     PMODULE pMod;
     #ifdef DEBUG
@@ -214 +240 @@
         {
             kprintf(("addModule: invalid parameter: hFile = 0\n"));
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
             return ERROR_INVALID_PARAMETER;
         }
@@ -219 +246 @@
         {
             kprintf(("addModule: invalid parameter: fFlags = 0x%#8x\n", fFlags));
+            KLOGEXIT(ERROR_INVALID_PARAMETER);
             return ERROR_INVALID_PARAMETER;
         }
@@ -228 +256 @@
     {
         kprintf(("addModule: out of memory!\n"));
+        KLOGEXIT(ERROR_NOT_ENOUGH_MEMORY);
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -247 +276 @@
     }
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }
@@ -265 +295 @@
 ULONG      removeModule(SFN hFile)
 {
+    KLOGENTRY1("ULONG","SFN hFile", hFile);
     PMODULE pMod = (PMODULE)AVLULRemove(&pSFNRoot, (AVLULKEY)hFile);
     if (pMod == NULL)
     {
         kprintf(("removeModule: Module not found! hFile=%#4x\n", hFile));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -300 +332 @@
     free(pMod);
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }
@@ -317 +350 @@
 PSZ ldrGetExePath(PSZ pszPath, BOOL fExecChild)
 {
+    KLOGENTRY2("PSZ","PSZ pszPath, BOOL fExecChild", pszPath, fExecChild);
     PCSZ    pszFilename;
     PCSZ    psz;
@@ -355 +389 @@
         {   /* Not called at task time? No current task! */
             kprintf(("ldrGetExePath: Failed to get current PTDA.\n"));
+            KLOGEXIT(NULL);
             return NULL;
         }
@@ -362 +397 @@
         {
             kprintf(("ldrGetExePath: Failed to get hMTE from the PTDAs.\n"));
+            KLOGEXIT(NULL);
             return NULL;
         }
@@ -370 +406 @@
         {
             kprintf(("ldrGetExePath: ldrASMpMTEFromHandle failed for hMTE=0x%04.\n", hMTE));
+            KLOGEXIT(NULL);
             return NULL;
         }
@@ -375 +412 @@
         {
             kprintf(("ldrGetExePath: mte_swapmte is NULL.\n"));
+            KLOGEXIT(NULL);
             return NULL;
         }
@@ -383 +421 @@
         {
             kprintf(("ldrGetExePath: smte_path is NULL.\n"));
+            KLOGEXIT(NULL);
             return NULL;
         }
@@ -391 +430 @@
     {
         kprintf(("ldrGetExePath: pszFilename is empty!\n"));
+        KLOGEXIT(NULL);
         return NULL;
     }
@@ -407 +447 @@
     {
         kprintf(("ldrGetExePath: Exepath is empty.\n"));
+        KLOGEXIT(NULL);
         return NULL;
     }
@@ -415 +456 @@
     memcpy(pszPath, pszFilename, psz - pszFilename);
     pszPath[psz - pszFilename] = '\0';
+    KLOGEXIT(pszPath);
     return pszPath;
 }
@@ -425 +467 @@
 ULONG ldrInit(void)
 {
+    KLOGENTRY0("ULONG");
     int rc = NO_ERROR;
 
@@ -437 +480 @@
     ModuleBase::ulInfoLevel = options.ulInfoLevel;
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/mmf.cpp ¶

@@ -1 @@
-/* $Id: mmf.cpp,v 1.1.2.1 2002-03-31 20:09:14 bird Exp $
+/* $Id: mmf.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $
  *
  * Memory Mapped Files.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: mmf.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $";
+#endif
 
 /** @design     Memory Mapped Files - Ring 0

branches/splittup/src/win32k/src/myLDRGetProcAddr.cpp ¶

@@ -1 @@
-/* $Id: myLDRGetProcAddr.cpp,v 1.1.2.1 2002-03-31 20:09:14 bird Exp $
+/* $Id: myLDRGetProcAddr.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $
  *
  * LDRGetProcAddr - Get an entry point to a module.
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myLDRGetProcAddr.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -24 +27 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -68 +71 @@
                                PULONG   pulProcType)
 {
+    KLOGENTRY6("ULONG","HMTE hmte, ULONG ulOrdinal, PCSZ pszName, PULONG pulAddress, BOOL fFlat, PULONG pulProcType", hmte, ulOrdinal, pszName, pulAddress, fFlat, pulProcType);
+    ULONG   rc;
     /*
      * Check if the fix is enabled, and needed, and possible to apply.
@@ -82 +87 @@
      * Let the real function do rest of the work.
      */
-    return LDRGetProcAddr(hmte, ulOrdinal, pszName, pulAddress, fFlat, pulProcType);
+    rc = LDRGetProcAddr(hmte, ulOrdinal, pszName, pulAddress, fFlat, pulProcType);
+    KLOGEXIT(rc);
+    return rc;
 }
 

branches/splittup/src/win32k/src/myLDRQAppType.cpp ¶

@@ -1 @@
-/* $Id: myLDRQAppType.cpp,v 1.1.2.1 2002-03-31 20:09:15 bird Exp $
+/* $Id: myLDRQAppType.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $
  *
  * _myLDRQAppType - _LDRQAppType overload.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myLDRQAppType.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -46 +49 @@
 ULONG LDRCALL myLDRQAppType(ULONG p1, ULONG p2)
 {
+    KLOGENTRY2("ULONG","ULONG p1, ULONG p2", p1, p2);
     APIRET rc;
 
-    kprintf(("myLDRQAppType: entry\n"));
     rc = KSEMRequestMutex(ptda_ptda_ptdasem(ptdaGetCur()), KSEM_INDEFINITE_WAIT);
     if (rc != NO_ERROR)
     {
         kprintf(("myLDRQAppType: failed to get intra-process semaphore.\n"));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -59 +63 @@
     {
         kprintf(("myLDRQAppType: failed to get loader semaphore.\n"));
+        KLOGEXIT(rc);
         return rc;
     }
@@ -72 +77 @@
     LDRClearSem();
     KSEMReleaseMutex(ptda_ptda_ptdasem(ptdaGetCur()));
-    kprintf(("myLDRQAppType: exit\n"));
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/myVMAllocMem.cpp ¶

@@ -1 @@
-/* $Id: myVMAllocMem.cpp,v 1.1.2.1 2002-03-31 20:09:15 bird Exp $
+/* $Id: myVMAllocMem.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $
  *
  * Debug module - overloads VMAllocMem to analyse input parameters....
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myVMAllocMem.cpp,v 1.1.2.2 2002-04-01 09:06:07 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -51 +54 @@
 APIRET KRNLCALL myVMAllocMem(ULONG p1, ULONG p2, ULONG p3, USHORT p4, USHORT p5, USHORT p6, ULONG p7, ULONG p8, ULONG p9)
 {
+    KLOGENTRY9("APIRET","ULONG p1, ULONG p2, ULONG p3, USHORT p4, USHORT p5, USHORT p6, ULONG p7, ULONG p8, ULONG p9", p1, p2, p3, p4, p5, p6, p7, p8, p9);
     APIRET rc;
 
     rc = VMAllocMem(p1,p2,p3,p4,p5,p6,p7,p8,(PVMAC)p9);
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/myldrCheckInternalName.cpp ¶

@@ -1 @@
-/* $Id: myldrCheckInternalName.cpp,v 1.1.2.1 2002-03-31 20:09:15 bird Exp $
+/* $Id: myldrCheckInternalName.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $
  *
  * ldrCheckInternalName - ldrCheckInternalName replacement with support for
@@ -9 +9 @@
  *
  */
-
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrCheckInternalName.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +27 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -62 +64 @@
 ULONG LDRCALL myldrCheckInternalName(PMTE pMTE)
 {
+    KLOGENTRY1("ULONG","PMTE pMTE", pMTE);
     /* Check if this feature is enabled */
     if (isDllFixesDisabled())
@@ -69 +72 @@
         kprintf(("myldrCheckInternalName: pMTE=0x%08x intname=%.*s path=%s rc=%d\n", /* (original)\",*/
                  pMTE, *(PCHAR)pMTE->mte_swapmte->smte_restab, (PCHAR)pMTE->mte_swapmte->smte_restab + 1, ldrpFileNameBuf, rc));
+        KLOGEXIT(rc);
         return rc;
         #else
-        return ldrCheckInternalName(pMTE);
+        ULONG rc = ldrCheckInternalName(pMTE);
+        KLOGEXIT(rc);
+        return rc;
         #endif
     }
@@ -90 +96 @@
      */
     if (!(pMTE->mte_flags1 & LIBRARYMOD))
+    {
+        KLOGEXIT(NO_ERROR);
         return NO_ERROR;
+    }
 
 
@@ -185 +194 @@
              pMTE, *(PCHAR)pMTE->mte_swapmte->smte_restab, (PCHAR)pMTE->mte_swapmte->smte_restab + 1, ldrpFileNameBuf, rc));
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/myldrClose.cpp ¶

@@ -1 @@
-/* $Id: myldrClose.cpp,v 1.1.2.1 2002-03-31 20:09:16 bird Exp $
+/* $Id: myldrClose.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $
  *
  * myldrClose - ldrClose
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrClose.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -22 +25 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -44 +47 @@
 ULONG LDRCALL myldrClose(SFN hFile)
 {
+    KLOGENTRY1("ULONG","SFN hFile", hFile);
+    ULONG   rc;
     /* closes handle */
     kprintf(("myldrClose: hFile = %.4x\n", hFile));
@@ -77 +82 @@
      * Finally call the real close function.
      */
-    return ldrClose(hFile);
+    rc = ldrClose(hFile);
+    KLOGEXIT(rc);
+    return rc;
 }

branches/splittup/src/win32k/src/myldrEnum32bitRelRecs.cpp ¶

@@ -1 @@
-/* $Id: myldrEnum32bitRelRecs.cpp,v 1.1.2.1 2002-03-31 20:09:16 bird Exp $
+/* $Id: myldrEnum32bitRelRecs.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $
  *
  * myldrEnum32bitRelRecs - ldrEnum32bitRelRecs
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrEnum32bitRelRecs.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -23 +26 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -58 +61 @@
     )
 {
+    KLOGENTRY6("ULONG","PMTE pMTE, ULONG iObject, ULONG iPageTable, PVOID pvPage, ULONG ulPageAddress, PVOID pvPTDA", pMTE, iObject, iPageTable, pvPage, ulPageAddress, pvPTDA);
     PMODULE pMod;
+    ULONG   rc;
 
     pMod = getModuleByMTE(pMTE);
@@ -72 +77 @@
         rc = pMod->Data.pModule->applyFixups(pMTE, iObject, iPageTable, pvPage, ulPageAddress, pvPTDA);
         if (rc != NO_ERROR)
+            KLOGEXIT(rc);
             return rc;
     }
 
-    return ldrEnum32bitRelRecs(pMTE, iObject, iPageTable, pvPage, ulPageAddress, pvPTDA);
+    rc = ldrEnum32bitRelRecs(pMTE, iObject, iPageTable, pvPage, ulPageAddress, pvPTDA);
+    KLOGEXIT(rc);
+    return rc;
 }

branches/splittup/src/win32k/src/myldrFindModule.cpp ¶

@@ -1 @@
-/* $Id: myldrFindModule.cpp,v 1.1.2.1 2002-03-31 20:09:16 bird Exp $
+/* $Id: myldrFindModule.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $
  *
  * ldrFindModule - ldrFindModule replacement with support for long DLL names
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrFindModule.cpp,v 1.1.2.2 2002-04-01 09:06:08 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -23 +26 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -69 +72 @@
 ULONG LDRCALL myldrFindModule(PCHAR pachFilename, USHORT cchFilename, USHORT usClass, PPMTE ppMTE)
 {
+    KLOGENTRY4("ULONG","PCHAR pachFilename, USHORT cchFilename, USHORT usClass, PPMTE ppMTE", pachFilename, cchFilename, usClass, ppMTE);
     /*
      * Log.
@@ -87 +91 @@
                      *ppMTE, (*ppMTE)->mte_handle, (*ppMTE)->mte_modname,
                      (*ppMTE)->mte_swapmte->smte_path, (*ppMTE)->mte_flags1 & CLASS_MASK));
+        KLOGEXIT(rc);
         return rc;
         #else
+        KLOGEXIT(ldrFindModule(pachFilename, cchFilename, usClass, ppMTE));
         return ldrFindModule(pachFilename, cchFilename, usClass, ppMTE);
         #endif
@@ -122 +128 @@
     {
         kprintf(("myldrFindModule: Unknown class flag! usClass=%d\n", usClass));
+        KLOGEXIT(ldrFindModule(pachFilename, cchFilename, usClass, ppMTE));
         return ldrFindModule(pachFilename, cchFilename, usClass, ppMTE);
     }
@@ -129 +136 @@
     {
         kprintf(("myldrFindModule: Invalid pointer(s); pachFilename=0x%08x  ppMTE=0x%08x", pachFilename, ppMTE));
+        KLOGEXIT(ERROR_INVALID_ACCESS);
         return ERROR_INVALID_ACCESS;
     }
@@ -140 +148 @@
         *ppMTE = NULL;
         kprintf(("myldrFindModule: Not found; cchFilename = 0\n"));
+        KLOGEXIT(ERROR_FILE_NOT_FOUND);
         return ERROR_FILE_NOT_FOUND;
     }
@@ -162 +171 @@
             rc = ldrTransPath(pachFilename);
             if (rc)
+            {
+                KLOGEXIT(rc);
                 return rc;
+            }
             pachFilename = ldrpFileNameBuf;
             cchFilename = (USHORT)(strlen(pachFilename) + 1);
@@ -224 +236 @@
         {
             kprintf(("myldrFindModule: Invalid name in class global; name=%.*s\n", cchFilename, pachFilename));
+            KLOGEXIT(ERROR_INVALID_NAME);
             return ERROR_INVALID_NAME;
         }
@@ -240 +253 @@
         {
             kprintf(("myldrFindModule: Invalid name! ldrGetFileName2 failed; name=%.*s\n", cchFilename, pachFilename));
+            KLOGEXIT(ERROR_INVALID_NAME);
             return ERROR_INVALID_NAME;
         }
@@ -366 +380 @@
                 kprintf(("myldrFindModule: Found pmte=0x%08x  hmte=0x%04x  modname=%.8s  path=%s (GLOBAL)\n",
                          pmte, pmte->mte_handle, pmte->mte_modname, pmte->mte_swapmte->smte_path));
+                KLOGEXIT(NO_ERROR);
                 return NO_ERROR;
             }
@@ -386 +401 @@
                 kprintf(("myldrFindModule: Found pmte=0x%08x  hmte=0x%04x  modname=%.8s  path=%s (%x)\n",
                          pmte, pmte->mte_handle, pmte->mte_modname, pSMTE->smte_path, pmte->mte_flags1 & CLASS_MASK));
+                KLOGEXIT(NO_ERROR);
                 return NO_ERROR;
             }
@@ -397 +413 @@
     *ppMTE = NULL;
     kprintf(("myldrFindModule: Not Found\n"));
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }

branches/splittup/src/win32k/src/myldrOpen.cpp ¶

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.1.2.1 2002-03-31 20:09:17 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrOpen.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $";
+#endif
 
 
@@ -29 +32 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "MZexe.h"                      /* LX structs and definitions. */
+#include "LXexe.h"                      /* LX structs and definitions. */
+#include "PEexe.h"                      /* PE structs and definitions. */
+#include "ELFexe.h"                     /* ELF structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -41 +46 @@
 
 #include "options.h"
-#include "elf.h"
-#include "OS2Krnl.h"
 #include "dev32.h"
 #include "ldr.h"
@@ -69 +72 @@
 ULONG LDRCALL myldrOpen(PSFN phFile, PSZ pszFilename, PULONG pfl)
 {
+    KLOGENTRY3("ULONG","PSFN phFile, PSZ pszFilename, PULONG pfl", phFile, pszFilename, pfl);
     static  int cNesting = 0;           /* This is an variable which hold the nesting */
                                         /* level of this function. This is useful     */
@@ -779 +783 @@
         *pfl &= ~0x1000UL; /* 0x1000 is the fixed media flag. */
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -810 +815 @@
 APIRET AddArgsToFront(int cArgs,  ...)
 {
+    KLOGENTRY2("APIRET","int cArgs, ...", cArgs, &cArgs);
     va_list     vaarg;                  /* Variable length argument list. */
     int         cchOldArgs;             /* Length of the old arguments (including the first argument). */
@@ -832 +838 @@
     {
         kprintf(("AddArgsToFront: not in tkExecPgm state.\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -838 +845 @@
     {
         kprintf(("AddArgsToFront: called when not in tkExecPgm data is invalid!\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -855 +863 @@
     {
         kprintf(("AddArgsToFront: the size of the arguments to add is zero!\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -870 +879 @@
         kprintf(("AddArgsToFront: argument buffer is too small to hold the arguments to add, cchOldArgs=%d, cchNewArgs=%d\n",
                  cchOldArgs, cchNewArgs));
+        KLOGEXIT(ERROR_BAD_ARGUMENTS);
         return ERROR_BAD_ARGUMENTS;
     }
@@ -914 +924 @@
     #endif
 
+    KLOGEXIT(NO_ERROR);
     return NO_ERROR;
 }
@@ -932 +943 @@
 APIRET SetExecName(const char *pszExecName)
 {
+    KLOGENTRY1("APIRET","const char * pszExecName", pszExecName);
     #ifdef DEBUG
     int cch;
@@ -938 +950 @@
     {
         kprintf(("ChangeExecName: filename is too long! cch=%d. name=%s\n", cch, pszExecName));
+        KLOGEXIT(ERROR_FILENAME_EXCED_RANGE);
         return ERROR_FILENAME_EXCED_RANGE;
     }
@@ -943 +956 @@
     {
         kprintf(("ChangeExecName: called when not in tkExecPgm state!!! FATAL ERROR!\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -949 +963 @@
     {
         kprintf(("ChangeExecName: called when not in tkExecPgm data is invalid!!! FATAL ERROR!\n"));
+        KLOGEXIT(ERROR_INVALID_PARAMETER);
         return ERROR_INVALID_PARAMETER;
     }
@@ -954 +969 @@
     strcpy(achTkExecPgmFilename, pszExecName);
 
+    KLOGEXIT(0);
     return 0;
 }
@@ -974 +990 @@
 APIRET OpenPATH(PSFN phFile, char *pszFilename, PULONG pfl)
 {
+    KLOGENTRY3("APIRET","PSFN phFile, char * pszFilename, PULONG pfl", phFile, pszFilename, pfl);
     APIRET      rc;
     USHORT      TCBFailErr_save;
@@ -984 +1001 @@
      */
     if (pszPath == NULL)
+    {
+        KLOGEXIT(ERROR_FILE_NOT_FOUND);
         return ERROR_FILE_NOT_FOUND;
+    }
 
     /**@sketch
@@ -1076 +1096 @@
                 default:
                     tcbSetTCBFailErr(tcbGetCur(), TCBFailErr_save);
+                    KLOGEXIT(rc);
                     return rc;
             }
@@ -1097 +1118 @@
     *phFile = 0;
     tcbSetTCBFailErr(tcbGetCur(), TCBFailErr_save);
+    KLOGEXIT(ERROR_FILE_NOT_FOUND);
     return ERROR_FILE_NOT_FOUND;
 }

branches/splittup/src/win32k/src/myldrOpenPath.cpp ¶

@@ -1 @@
-/* $Id: myldrOpenPath.cpp,v 1.1.2.1 2002-03-31 20:09:18 bird Exp $
+/* $Id: myldrOpenPath.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $
  *
  * myldrOpenPath - ldrOpenPath used to open executables we'll override
@@ -9 +9 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrOpenPath.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +28 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -91 +94 @@
     )
 {
-
+    KLOGENTRY5("ULONG","PCHAR pachFilename, USHORT cchFilename, ldrlv_t * plv, PULONG pful, ULONG lLibPath", pachFilename, cchFilename, plv, pful, lLibPath);
     APIRET  rc;
 
@@ -108 +111 @@
                  pachFilename, cchFilename, plv, pful
                  ));
+        KLOGEXIT(ldrOpenPath(pachFilename, cchFilename, plv, pful, lLibPath));
         return ldrOpenPath(pachFilename, cchFilename, plv, pful, lLibPath);
     }
@@ -209 +213 @@
     fldrOpenExtentionFix = FALSE;
 
+    KLOGEXIT(rc);
     return rc;
 }
@@ -225 +230 @@
     )
 {
-    return myldrOpenPath(pachFilename, cchFilename, plv, pful, 3);
+    KLOGENTRY4("ULONG","PCHAR pachFilename, USHORT cchFilename, ldrlv_t * plv, PULONG pful", pachFilename, cchFilename, plv, pful);
+    ULONG   rc = myldrOpenPath(pachFilename, cchFilename, plv, pful, 3);
+    KLOGEXIT(rc);
+    return rc;
 }
 

branches/splittup/src/win32k/src/myldrRead.cpp ¶

@@ -1 @@
-/* $Id: myldrRead.cpp,v 1.1.2.1 2002-03-31 20:09:18 bird Exp $
+/* $Id: myldrRead.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $
  *
  * myldrRead - ldrRead.
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrRead.cpp,v 1.1.2.2 2002-04-01 09:06:09 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -22 +25 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -66 +69 @@
     )
 {
+    KLOGENTRY6("ULONG","SFN hFile, ULONG ulOffset, PVOID pvBuffer, ULONG fpBuffer, ULONG cbToRead, PMTE pMTE", hFile, ulOffset, pvBuffer, fpBuffer, cbToRead, pMTE);
     ULONG   rc;
 
@@ -105 +109 @@
     #endif
 
+    KLOGEXIT(rc);
     return rc;
 }

branches/splittup/src/win32k/src/myldrSetVMflags.cpp ¶

@@ -1 @@
-/* $Id: myldrSetVMflags.cpp,v 1.1.2.1 2002-03-31 20:09:19 bird Exp $
+/* $Id: myldrSetVMflags.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $
  *
  * myldrSetVMflags - ldrSetVMflags
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrSetVMflags.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +28 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -52 +55 @@
 VOID LDRCALL myldrSetVMflags(PMTE pMTE, ULONG flObj, PULONG pflFlags1, PULONG pflFlags2)
 {
+    KLOGENTRY4("VOID","PMTE pMTE, ULONG flObj, PULONG pflFlags1, PULONG pflFlags2", pMTE, flObj, pflFlags1, pflFlags2);
     /*
      * call the orignal and let it do it's work.
@@ -71 +75 @@
                  ));
     }
+    KLOGEXITVOID();
 }

branches/splittup/src/win32k/src/myldrWasLoadModuled.cpp ¶

@@ -1 @@
-/* $Id: myldrWasLoadModuled.cpp,v 1.1.2.1 2002-03-31 20:09:19 bird Exp $
+/* $Id: myldrWasLoadModuled.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $
  *
  * ldrWasLoadModuled - Tells OS/2 that the executable module was LoadModuled
@@ -10 +10 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: myldrWasLoadModuled.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +28 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <exe386.h>
+#include "NEexe.h"                      /* Wine NE structs and definitions. */
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>
 #include <kKrnlLib.h>
@@ -62 +66 @@
 ULONG LDRCALL myldrWasLoadModuled(HMTE hmte, PPTDA pptda, PULONG pcUsage)
 {
+    KLOGENTRY3("ULONG","HMTE hmte, PPTDA pptda, PULONG pcUsage", hmte, pptda, pcUsage);
+    ULONG   rc;
+
     /*
      * Check if the fix is enabled.
@@ -82 +89 @@
      * Let the real function do the work.
      */
-    return ldrWasLoadModuled(hmte, pptda, pcUsage);
+    rc = ldrWasLoadModuled(hmte, pptda, pcUsage);
+    KLOGEXIT(rc);
+    return rc;
 }
 

branches/splittup/src/win32k/src/pe2lx.cpp ¶

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.1.2.1 2002-03-31 20:09:20 bird Exp $
+/* $Id: pe2lx.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -10 +10 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: pe2lx.cpp,v 1.1.2.2 2002-04-01 09:06:10 bird Exp $";
+#endif
 
 
@@ -30 +33 @@
     #define Yield() DosSleep(0)
 #endif
-
+#define DWORD                       ULONG
+#define PDWORD                      PULONG
 
 /*
@@ -84 +88 @@
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
-#include <peexe.h>                      /* Wine PE structs and definitions. */
-#include <neexe.h>                      /* Wine NE structs and definitions. */
-#include <newexe.h>                     /* OS/2 NE structs and definitions. */
-#include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include "MZexe.h"                      /* Wine NE structs and definitions. */
+#include "NEexe.h"                      /* Wine NE structs and definitions. */
+#include "LXexe.h"                      /* OS/2 LX structs and definitions. */
+#include "PEexe.h"                      /* Wine PE structs and definitions. */
 #include <OS2Krnl.h>                    /* kernel structs.  (SFN) */
 #include <kKrnlLib.h>
@@ -107 +111 @@
 #include "modulebase.h"                 /* ModuleBase class definitions, ++. */
 #include "pe2lx.h"                      /* Pe2Lx class definitions, ++. */
+#define WIN32API
 #include <versionos2.h>                 /* Pe2Lx version. */
 #include "options.h"                    /* Win32k options. */
@@ -1137 +1142 @@
             if (pbr->VirtualAddress + PAGESIZE >= ulRVAPage)
             {
-                PWORD pwoffFixup   = &pbr->TypeOffset[0];
-                ULONG cRelocations = (pbr->SizeOfBlock - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(WORD); /* note that sizeof(BaseReloc) is 12 bytes! */
+                PUSHORT pwoffFixup   = &pbr->TypeOffset[0];
+                ULONG cRelocations = (pbr->SizeOfBlock - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(USHORT); /* note that sizeof(BaseReloc) is 12 bytes! */
 
                 /* Some bound checking just to be sure it works... */
@@ -1144 +1149 @@
                 {
                     printWar(("Block ends after BaseRelocation datadirectory.\n"));
-                    cRelocations = (((unsigned)pBaseRelocs + cbBaseRelocs) - (unsigned)pbr - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(WORD);
+                    cRelocations = (((unsigned)pBaseRelocs + cbBaseRelocs) - (unsigned)pbr - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(USHORT);
                 }
 
@@ -1408 +1413 @@
         if (pbr->VirtualAddress + PAGESIZE >= ulRVAPage)
         {
-            PWORD pwoffFixup   = &pbr->TypeOffset[0];
-            ULONG cRelocations = (pbr->SizeOfBlock - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(WORD); /* note that sizeof(BaseReloc) is 12 bytes! */
+            PUSHORT pwoffFixup   = &pbr->TypeOffset[0];
+            ULONG cRelocations = (pbr->SizeOfBlock - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(USHORT); /* note that sizeof(BaseReloc) is 12 bytes! */
 
             /* Some bound checking just to be sure it works... */
@@ -1415 +1420 @@
             {
                 printWar(("Block ends after BaseRelocation datadirectory.\n"));
-                cRelocations = (((unsigned)pBaseRelocs + cbBaseRelocs) - (unsigned)pbr - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(WORD);
+                cRelocations = (((unsigned)pBaseRelocs + cbBaseRelocs) - (unsigned)pbr - offsetof(IMAGE_BASE_RELOCATION, TypeOffset)) / sizeof(USHORT);
             }
 
@@ -2953 +2958 @@
             {
                 printInfA(("TibFix import fixup\n"));
-                rc = add32OrdImportFixup((WORD)((paObjects[iObj].Misc.offTIBFix + paObjects[iObj].ulRVA + TIBFIX_OFF_CALLADDRESS) & (PAGESIZE-1UL)),
+                rc = add32OrdImportFixup((USHORT)((paObjects[iObj].Misc.offTIBFix + paObjects[iObj].ulRVA + TIBFIX_OFF_CALLADDRESS) & (PAGESIZE-1UL)),
                                          ul,
                                          pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_DLL ?
@@ -2975 +2980 @@
                 {
                     if (Thunk.u1.Ordinal & (ULONG)IMAGE_ORDINAL_FLAG)
-                        rc = add32OrdImportFixup((WORD)(ulRVAFirstThunk & (PAGESIZE-1)),
+                        rc = add32OrdImportFixup((USHORT)(ulRVAFirstThunk & (PAGESIZE-1)),
                                                  ulModuleOrdinal, Thunk.u1.Ordinal & 0xffff);
                     else if (Thunk.u1.Ordinal > 0UL && Thunk.u1.Ordinal < pNtHdrs->OptionalHeader.SizeOfImage)
@@ -2983 +2988 @@
                         if (rc != NO_ERROR)
                             break;
-                        rc = add32NameImportFixup((WORD)(ulRVAFirstThunk & (PAGESIZE-1)),
+                        rc = add32NameImportFixup((USHORT)(ulRVAFirstThunk & (PAGESIZE-1)),
                                                   ulModuleOrdinal, psz);
                         free(psz);
@@ -3045 +3050 @@
         if (fBaseRelocs && BaseReloc.VirtualAddress == ulRVAPage)
         {
-            ULONG c = (BaseReloc.SizeOfBlock - sizeof(BaseReloc.SizeOfBlock) - sizeof(BaseReloc.VirtualAddress)) / sizeof(WORD); /* note that sizeof(BaseReloc) is 12 bytes! */
-            PWORD pawoffFixup = NULL;
+            ULONG c = (BaseReloc.SizeOfBlock - sizeof(BaseReloc.SizeOfBlock) - sizeof(BaseReloc.VirtualAddress)) / sizeof(USHORT); /* note that sizeof(BaseReloc) is 12 bytes! */
+            PUSHORT pawoffFixup = NULL;
 
             if (c != 0)
             {
-                pawoffFixup = (PWORD)malloc((size_t)(c * sizeof(WORD)));
+                pawoffFixup = (PUSHORT)malloc((size_t)(c * sizeof(USHORT)));
                 if (pawoffFixup != NULL)
                     rc = pRelocReader->readAtRVA(ulRVABaseReloc + offsetof(IMAGE_BASE_RELOCATION, TypeOffset),
-                                                 pawoffFixup, c * sizeof(WORD));
+                                                 pawoffFixup, c * sizeof(USHORT));
                 else
                     rc = ERROR_NOT_ENOUGH_MEMORY;
@@ -3060 +3065 @@
                 for (ul = 0; ul < c && rc == NO_ERROR; ul++)
                 {
-                    WORD  woffFixup;
+                    USHORT  woffFixup;
                     ULONG ulTarget;
                     /* Get relocation type/offset. */
@@ -3074 +3079 @@
                         {
                             case IMAGE_REL_BASED_HIGHLOW:
-                                rc = add32OffsetFixup((WORD)(woffFixup & 0x0FFF), ulTarget);
+                                rc = add32OffsetFixup((USHORT)(woffFixup & 0x0FFF), ulTarget);
                                 printInfA(("Fixup: 0x%03x target 0x%08x (rc = %d) %s\n",
                                            (woffFixup & 0x0FFF), ulTarget, rc,
@@ -3305 +3310 @@
                     )
                 {
-                    WORD usOrdinal;
+                    USHORT usOrdinal;
 
                     for (ul = 0; ul < ExpDir.NumberOfNames && rc == NO_ERROR; ul++)
@@ -3313 +3318 @@
                         if (rc != NO_ERROR)
                             break;
-                        rc = pFATFOTReader->readAtRVA((ULONG)ExpDir.AddressOfNameOrdinals + ul * sizeof(WORD),
+                        rc = pFATFOTReader->readAtRVA((ULONG)ExpDir.AddressOfNameOrdinals + ul * sizeof(USHORT),
                                                       SSToDS(&usOrdinal), sizeof(usOrdinal));
                         if (rc != NO_ERROR)
@@ -3676 +3681 @@
  * This code got a bit dirty while trying to optimize memory usage.
  */
-ULONG Pe2Lx::add32OffsetFixup(WORD offSource, ULONG ulTarget)
+ULONG Pe2Lx::add32OffsetFixup(USHORT offSource, ULONG ulTarget)
 {
     struct r32_rlc *prlc;
@@ -3827 +3832 @@
  *
  */
-ULONG  Pe2Lx::add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal)
+ULONG  Pe2Lx::add32OrdImportFixup(USHORT offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal)
 {
     struct r32_rlc *prlc;
@@ -3952 +3957 @@
  *
  */
-ULONG  Pe2Lx::add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName)
+ULONG  Pe2Lx::add32NameImportFixup(USHORT offSource, ULONG ulModuleOrdinal, PCSZ pszFnName)
 {
     APIRET          rc;
@@ -5175 +5180 @@
     {
         int   i;
-        WORD  w;
+        USHORT  w;
 
         printInf(("\nPE-headers - File header\n"));

branches/splittup/src/win32k/src/xx2lxmain.cpp ¶

@@ -1 @@
-/* $Id: xx2lxmain.cpp,v 1.1.2.1 2002-03-31 20:09:21 bird Exp $
+/* $Id: xx2lxmain.cpp,v 1.1.2.2 2002-04-01 09:06:11 bird Exp $
  *
  * Xx2Lx main program. (Ring 3 only!)
@@ -8 +8 @@
  *
  */
+#ifndef NOFILEID
+static const char szFileId[] = "$Id: xx2lxmain.cpp,v 1.1.2.2 2002-04-01 09:06:11 bird Exp $";
+#endif
 
 /*******************************************************************************
@@ -25 +28 @@
 *******************************************************************************/
 #include <os2.h>
-#include <peexe.h>
-#include <neexe.h>
-#include <newexe.h>
-#include <exe386.h>
-#include "elf.h"
+#include "MZexe.h"                      /* MZ structs and definitions. */
+#include "LXexe.h"                      /* LX structs and definitions. */
+#include "PEexe.h"                      /* PE structs and definitions. */
+#include "ELFexe.h"                     /* ELF structs and definitions. */
 #include <malloc.h>
 #include <string.h>