Changeset 4164 for trunk/src/win32k/test

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

Location:

trunk/src/win32k/test

Files:

• TestKernels.cmd (added)
• dos.c (modified) (2 diffs)
• fake.c (modified) (10 diffs)
• fakea.asm (modified) (6 diffs)
• tst.sh (added)
• tst2.sh (added)
• win32ktst.c (modified) (28 diffs)

trunk/src/win32k/test/dos.c

@@ -1 @@
-/* $Id: dos.c,v 1.1 2000-07-16 22:18:14 bird Exp $
+/* $Id: dos.c,v 1.2 2000-09-02 21:08:20 bird Exp $
  *
  * Thunkers for OS/2 APIs.
@@ -22 +22 @@
 *******************************************************************************/
 #include <os2.h>
+
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 
 #include "test.h"

trunk/src/win32k/test/fake.c

@@ -1 @@
-/* $Id: fake.c,v 1.1 2000-07-16 22:18:14 bird Exp $
+/* $Id: fake.c,v 1.2 2000-09-02 21:08:20 bird Exp $
  *
  * Fake stubs for the ldr and kernel functions we imports or overloads.
@@ -29 +29 @@
 #include <string.h>
 
+#include "devSegDf.h"                   /* Win32k segment definitions. */
+
 #include "log.h"
 #include "OS2Krnl.h"
@@ -60 +62 @@
  * Pointer to the loader semaphore.
  */
-static LONG     lfakeLDRSem = 0;        /* Used as a counter. */
-HKMTX           fakeLDRSem = (HKMTX)&lfakeLDRSem;
+KSEMMTX         fakeLDRSem;
+
+CHAR            szBeginLibPath[1024];
+CHAR            szEndLibPath[1024];
+CHAR            szLibPath[1024];
+PSZ             fakeLDRLibPath = &szLibPath[0];
+
+CHAR            szldrpFileNameBuf[CCHMAXPATH];
+PSZ             fakeldrpFileNameBuf = &szldrpFileNameBuf[0];
 
 static CHAR     achHeaderBuffer[256];   /* Buffer to read exe header into. */
 PVOID           pheaderbuf = &achHeaderBuffer[0];
+
 
 /*
@@ -112 +122 @@
 VOID  LDRCALL   fakeldrUCaseString(PCHAR pachString, USHORT cchString);
 ULONG LDRCALL   fakeldrMTEValidatePtrs(PSMTE psmte, ULONG ulMaxAddr, ULONG off);
+unsigned short  getSlot(void);
+
+
+
+/**
+ * Initiate workers (imported kernel functions / vars)
+ * @status    partially implemented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+void  workersinit(void)
+{
+    APIRET rc;
+
+    /*
+     * Make code writable.
+     */
+    DosSetMem(&CODE16START, &CODE16END - &CODE16START, PAG_WRITE | PAG_READ);
+    DosSetMem(&CODE32START, &CODE32END - &CODE32START, PAG_WRITE | PAG_READ);
+
+    /*
+     * Loader semaphore
+     */
+    fakeKSEMInit((PKSEM)(void*)&fakeLDRSem, KSEM_MUTEX, KSEM_DEFAULT);
+
+    /*
+     * Intra process semaphore.
+     */
+    fakeKSEMInit((PKSEM)(void*)&fakeptda_ptdasem, KSEM_MUTEX, KSEM_DEFAULT);
+
+    /*
+     * LIBPaths
+     */
+    rc = DosQueryExtLIBPATH(szBeginLibPath, BEGIN_LIBPATH);
+    rc = DosQueryHeaderInfo(NULLHANDLE, 0, szLibPath, sizeof(szLibPath), QHINF_LIBPATH);
+    rc = DosQueryExtLIBPATH(szEndLibPath, END_LIBPATH);
+
+    rc = rc;
+}
 
 
@@ -169 +217 @@
         if (pfl != NULL)
             *pfl = 0;
+        rc = DosQueryPathInfo(pszFilename, FIL_QUERYFULLNAME, fakeldrpFileNameBuf, CCHMAXPATH);
+        rc = NO_ERROR;
     }
 
@@ -712 +762 @@
 ULONG LDRCALL fakeLDRClearSem(void)
 {
-    if (lfakeLDRSem == 0)
-        kprintf(("fakeLDRClearSem: lfakeLDRSem is 0 allready\n"));
-    else
-        lfakeLDRSem--;
-
-    printf("fakeLDRClearSem:                usage count = %d, rc = %d\n", lfakeLDRSem, NO_ERROR);
-
-    return NO_ERROR;
+    return fakeKSEMReleaseMutex(&fakeLDRSem);
 }
 
@@ -730 +773 @@
  * @remark
  */
-ULONG KRNLCALL fakeKSEMRequestMutex(HKMTX hkmtx, ULONG ulTimeout)
-{
-    (*(PLONG)hkmtx)++;
-
-    printf("fakeKSEMRequestMutex:           hkmtx = %p, ulTimeout = 0x%x, usage count = %d, rc = %d\n",
-           hkmtx, ulTimeout, *(PLONG)hkmtx, NO_ERROR);
-
-    return NO_ERROR;
+ULONG KRNLCALL fakeKSEMRequestMutex(HKSEMMTX hkmtx, ULONG ulTimeout)
+{
+    unsigned short usSlot = getSlot();
+    ULONG          rc = NO_ERROR;
+
+    if (memcmp(&hkmtx->debug.ksem_achSignature[0], "KSEM", 4) != 0)
+    {
+        printf("fakeKSEMQueryMutex:             hkmtx = %p, invalid signature (%.4s)\n", hkmtx, hkmtx->debug.ksem_achSignature);
+        return FALSE;
+    }
+
+    if (hkmtx->debug.ksem_Owner == 0)
+    {
+        hkmtx->debug.ksem_Owner = usSlot;
+        hkmtx->debug.ksem_cusNest = 1;
+    }
+    else if (hkmtx->debug.ksem_Owner == usSlot)
+        hkmtx->debug.ksem_cusNest++;
+    else
+        rc = ERROR_SEM_BUSY;
+
+    printf("fakeKSEMRequestMutex:           hkmtx = %p, ulTimeout = 0x%x, owner = %d, usage count = %d, rc = %d\n",
+           hkmtx, ulTimeout, hkmtx->debug.ksem_cusNest, hkmtx->debug.ksem_Owner, ERROR_SEM_BUSY);
+
+    return rc;
+}
+
+
+/**
+ * KSEMReleaseMutex faker.
+ * @returns   NO_ERROR
+ * @param     hkmtx
+ * @param     ulTimeout
+ * @status    completely implemented.
+ * @remark
+ */
+ULONG KRNLCALL fakeKSEMReleaseMutex(HKSEMMTX hkmtx)
+{
+    unsigned int    usSlot = getSlot();
+    int rc = NO_ERROR;
+
+    if (memcmp(&hkmtx->debug.ksem_achSignature[0], "KSEM", 4) != 0)
+    {
+        printf("fakeKSEMQueryMutex:             hkmtx = %p, invalid signature (%.4s)\n", hkmtx, hkmtx->debug.ksem_achSignature);
+        return FALSE;
+    }
+
+    if (hkmtx->debug.ksem_Owner == usSlot)
+    {
+        if (--hkmtx->debug.ksem_cusNest == 0)
+            hkmtx->debug.ksem_Owner = 0;
+    }
+    else
+        rc = ERROR_NOT_OWNER;
+
+    printf("fakeKSEMReleaseMutex:           hkmtx = %p, usage count = %d, owner = %d, rc = %d\n",
+           hkmtx, hkmtx->debug.ksem_cusNest, hkmtx->debug.ksem_Owner, rc);
+
+    return rc;
+}
+
+
+
+/**
+ * KSEMQueryMutex faker.
+ * @returns     TRUE if owner or clear. Clear if *pcusNest is 0.
+ *              FALSE if other owner.
+ * @param       hkmtx       Handle to kernel mutex.
+ * @param       pcusNest    Pointer to variable which is to receive the nesting count.
+ *                          (ie. the number of times we have taken this semaphore.)
+ * @status      completely implemented.
+ * @author      knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+BOOL KRNLCALL  fakeKSEMQueryMutex(HKSEMMTX hkmtx, PUSHORT pcusNest)
+{
+    unsigned int    usSlot = getSlot();
+    BOOL            fRc = TRUE;
+
+    if (memcmp(&hkmtx->debug.ksem_achSignature[0], "KSEM", 4) != 0)
+    {
+        printf("fakeKSEMQueryMutex:             hkmtx = %p, invalid signature (%.4s)\n", hkmtx, hkmtx->debug.ksem_achSignature);
+        return FALSE;
+    }
+
+    if (hkmtx->debug.ksem_Owner == 0)
+    {
+        if (pcusNest)
+            *pcusNest = 0;
+        fRc = FALSE;
+    }
+    else
+    {
+        fRc = (hkmtx->debug.ksem_Owner == usSlot);
+        if (pcusNest)
+            *pcusNest = hkmtx->debug.ksem_cusNest;
+    }
+
+    printf("fakeKSEMQueryMutex:             hkmtx = %p, usage count = %d, owner = %d, *pcusNest = %d, rc = %d\n",
+           hkmtx, hkmtx->debug.ksem_cusNest, hkmtx->debug.ksem_Owner, pcusNest ? *pcusNest : -1, fRc);
+
+    return fRc;
+}
+
+
+/**
+ * KSEMInit faker.
+ * @param       pksem       Pointer to the semaphore struct to initiate.
+ * @param       fulType     Semaphore type. (only KSEM_MUTEX is supported)
+ * @param       fulFlags    Semaphore flags. (not validated)
+ * @status      partially implemented.
+ * @author      knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+VOID  KRNLCALL  fakeKSEMInit(PKSEM pksem, ULONG fulType, ULONG fulFlags)
+{
+    if (fulType != KSEM_MUTEX)
+    {
+        printf("fakeKSEMInit:                   Invalid fulType parameter (%d).\n", fulType);
+        return; /*ERROR_INVALID_PARAMETER;*/
+    }
+
+    memcpy(pksem->mtx.debug.ksem_achSignature, "KSEM", 4);
+    pksem->mtx.debug.ksem_bFlags = (char)fulFlags;
+    pksem->mtx.debug.ksem_bType = KSEM_MUTEX;
+    pksem->mtx.debug.ksem_cusNest = 0;
+    pksem->mtx.debug.ksem_cusPendingWriters = 0;
+    pksem->mtx.debug.ksem_Owner = 0;
+
+    printf("fakeKSEMInit:                   pksem=%p, fulType=%d, fulFlags=0x%x.\n", pksem, fulType, fulFlags);
+}
+
+
+/**
+ * Gets the thread slot number.
+ * @returns     Thread slot number.
+ * @status      completely implemented.
+ * @author      knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+unsigned short getSlot(void)
+{
+    PPIB ppib;
+    PTIB ptib;
+    BOOL            f32Stack = ((int)&ppib > 0x10000);
+
+    if (!f32Stack) ThunkStack16To32();
+
+    DosGetInfoBlocks(&ptib, &ppib);
+
+    if (!f32Stack) ThunkStack32To16();
+
+    return (unsigned short)ptib->tib_ordinal;
 }
 
@@ -863 +1048 @@
 
     printf("tkExecPgmWorker:                execFlag = %d, pArg = %p, pEnv = %p, pszFilename = %s\n", execFlag, pArg, pEnv, pszFilename);
+
+    /*
+     * Take loader semaphore.
+     */
+    rc = KSEMRequestMutex(&fakeLDRSem, KSEM_INDEFINITE_WAIT);
+    if (rc != NO_ERROR)
+    {
+        return rc;
+    }
 
     /*
@@ -1479 +1673 @@
          i++, psz += 1 + *psz)
     {
-        if (!memcmp(psz+1, "DOSCALLS", *psz))
+        if (*psz == 8 && !strnicmp(psz+1, "DOSCALLS", 8))
             continue;
 
@@ -1563 +1757 @@
 }
 
+
+PMTE KRNLCALL fakeldrASMpMTEFromHandle(HMTE  hMTE)
+{
+    PMTE pMte = (PMTE)hMTE;
+
+    pMte += 10; //just do something!
+
+    return NULL;
+}
+
+ULONG LDRCALL   fakeldrFindModule(PCHAR pachFilename, USHORT cchFilename, USHORT usClass, PPMTE ppMTE)
+{
+    APIRET rc = NO_ERROR;
+    usClass = usClass;
+    cchFilename = cchFilename;
+    pachFilename = pachFilename;
+    *ppMTE = NULL;
+    return rc;
+}
+
+
+/**
+ * Gets the path (name with fully qualified path) from a SFN.
+ * @returns     Pointer to the path of hFile.
+ * @param       hFile   SFN filehandle.
+ */
+PSZ SECCALL fakeSecPathFromSFN(SFN hFile)
+{
+    APIRET  rc;
+    BOOL    f32Stack = ((int)&hFile > 0x10000);
+
+    if (!f32Stack) ThunkStack16To32();
+
+    rc = ERROR_NOT_SUPPORTED;
+
+    if (!f32Stack) ThunkStack32To16();
+
+    printf("fakeSecPathFromSFN:                    - not implemented - hFile = 0x%04x, rc = %d\n", hFile, rc);
+
+    return rc;
+}
+

trunk/src/win32k/test/fakea.asm

@@ -1 @@
-; $Id: fakea.asm,v 1.1 2000-07-16 22:18:15 bird Exp $
+; $Id: fakea.asm,v 1.2 2000-09-02 21:08:21 bird Exp $
 ;
 ; Fake assembly imports.
@@ -30 +30 @@
     public fakeptda_start
     public fakeptda_environ
+    public fakeptda_module
+    public fakeptda_ptdasem
+    public fakeptda_pBeginLIBPATH
     public fakef_FuStrLenZ
     public fakef_FuStrLen
     public fakef_FuBuff
     public fakeg_tkExecPgm
+    public fake_tkStartProcess
     public CalltkExecPgm
 
 
 ;
-;   Imported Functions
+;   Imported Functions and Variables.
 ;
     extrn tkExecPgmWorker:PROC          ; fake.c
-
+    extrn _fakeLDRClearSem@0:PROC       ; fake.c
+    extrn _fakeKSEMRequestMutex@8:PROC  ; fake.c
+    extrn fakeLDRSem:BYTE               ; fake.c
 
 DATA16 SEGMENT
@@ -56 +62 @@
 fakeptda_dummy              db  123 dup (0)
 fakeptda_environ            dw      1   ; 1 is the hardcoded HOB of the win32ktst.exe's environment.
+fakeptda_ptdasem            db  20  dup (0) ; PTDA semaphore - Intra-Process serialisation mutex KSEM (sg244640).
+fakeptda_module             dw      1   ; 1 is the hardcoded HMTE of the current executable module.
+fakeptda_pBeginLIBPATH      dd      0   ; BEGINLIBPATH not implemented.
+                            dd      0   ; ENDLIBPATH not implemented.
 
 
@@ -249 +259 @@
 
 CODE32 SEGMENT
+;;
+; Faker of which simply clears the loader semaphore.
+; @cproto    none! (void _Optlink   fake_tkStartProcess(void))
+; @returns
+; @param
+; @uses
+; @equiv
+; @time
+; @sketch
+; @status
+; @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+; @remark
+fake_tkStartProcess PROC NEAR
+    push    ebp
+    mov     ebp, esp
+
+    push    ebx
+    push    ecx
+
+    call    _fakeLDRClearSem@0
+
+    pop     ecx
+    pop     ebx
+
+    xor     eax, eax
+    leave
+    ret
+fake_tkStartProcess ENDP
+
+
 ;;
 ; Fake g_tkExecPgm implementation.
@@ -270 +310 @@
 
     ;
-    ; We just have to make some common code...
+    ; Call C worker
     ;
     sub     esp, 10h
@@ -302 +342 @@
                                         ;     ebp+8, ebp+c, ebp+10, ebp+14
                                         ;     esp+0, esp+4, esp+08, esp+0c
-
+    or      eax, eax
+    jnz     ftkep_ret
+    call    fake_tkStartProcess         ; If succesfully so far. call start process.
+    jmp     ftkep_ret2                  ; <Currently no parameters are implemented.>
+
+ftkep_ret:
+    push    eax
+    call    _fakeLDRClearSem@0          ; clear the semaphore.
+    pop     eax
+
+ftkep_ret2:
     leave
     ret

trunk/src/win32k/test/win32ktst.c

@@ -1 @@
-/* $Id: win32ktst.c,v 1.1 2000-07-16 22:18:16 bird Exp $
+/* $Id: win32ktst.c,v 1.2 2000-09-02 21:08:21 bird Exp $
  *
  * Win32k test module.
@@ -26 +26 @@
     (PVOID)( ( (((unsigned)(flataddr) << 3) & 0xfff80000) | (SEL_LDT_RPL3 << 16) ) | ((unsigned)(flataddr) & 0xffff) )
 
+#define DWORD   ULONG
+#define WORD    USHORT
+
 /*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
 #include <os2.h>
+#include <exe386.h>
+
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 
 #include "malloc.h"
@@ -42 +48 @@
 #include "devcmd.h"
 #include "os2krnl.h"
+#include "avl.h"
+#include "ldr.h"
 #include "ldrCalls.h"
 #include "test.h"
@@ -47 +55 @@
 #include "macros.h"
 #include "log.h"
+
+
+
 
 
@@ -133 +144 @@
 
 /*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+#ifndef QS_MTE
+   /* From OS/2 Toolkit v4.5 (BSEDOS.H) */
+
+   /* Global Record structure
+    * Holds all global system information. Placed first in user buffer
+    */
+   typedef struct qsGrec_s {  /* qsGrec */
+           ULONG         cThrds;
+           ULONG         c32SSem;
+           ULONG         cMFTNodes;
+   }qsGrec_t;
+
+   /*
+    *      System wide MTE information
+    *      ________________________________
+    *      |       pNextRec                |----|
+    *      |-------------------------------|    |
+    *      |       hmte                    |    |
+    *      |-------------------------------|    |
+    *      |       ctImpMod                |    |
+    *      |-------------------------------|    |
+    *      |       ctObj                   |    |
+    *      |-------------------------------|    |
+    *      |       pObjInfo                |----|----------|
+    *      |-------------------------------|    |          |
+    *      |       pName                   |----|----|     |
+    *      |-------------------------------|    |    |     |
+    *      |       imported module handles |    |    |     |
+    *      |          .                    |    |    |     |
+    *      |          .                    |    |    |     |
+    *      |          .                    |    |    |     |
+    *      |-------------------------------| <--|----|     |
+    *      |       "pathname"              |    |          |
+    *      |-------------------------------| <--|----------|
+    *      |       Object records          |    |
+    *      |       (if requested)          |    |
+    *      |_______________________________|    |
+    *                                      <-----
+    *      NOTE that if the level bit is set to QS_MTE, the base Lib record will be followed
+    *      by a series of object records (qsLObj_t); one for each object of the
+    *      module.
+    */
+
+   typedef struct qsLObjrec_s {  /* qsLOrec */
+           ULONG         oaddr;  /* object address */
+           ULONG         osize;  /* object size */
+           ULONG         oflags; /* object flags */
+   } qsLObjrec_t;
+
+   typedef struct qsLrec_s {     /* qsLrec */
+           void  FAR        *pNextRec;      /* pointer to next record in buffer */
+           USHORT           hmte;           /* handle for this mte */
+           USHORT           fFlat;          /* true if 32 bit module */
+           ULONG            ctImpMod;       /* # of imported modules in table */
+           ULONG            ctObj;          /* # of objects in module (mte_objcnt)*/
+           qsLObjrec_t FAR  *pObjInfo;      /* pointer to per object info if any */
+           UCHAR     FAR    *pName;         /* -> name string following struc */
+   } qsLrec_t;
+
+
+
+   /* Pointer Record Structure
+    *      This structure is the first in the user buffer.
+    *      It contains pointers to heads of record types that are loaded
+    *      into the buffer.
+    */
+
+   typedef struct qsPtrRec_s {   /* qsPRec */
+           qsGrec_t        *pGlobalRec;
+           void            *pProcRec;      /* ptr to head of process records */
+           void            *p16SemRec;     /* ptr to head of 16 bit sem recds */
+           void            *p32SemRec;     /* ptr to head of 32 bit sem recds */
+           void            *pMemRec;       /* ptr to head of shared mem recs */
+           qsLrec_t        *pLibRec;       /* ptr to head of mte records */
+           void            *pShrMemRec;    /* ptr to head of shared mem records */
+           void            *pFSRec;        /* ptr to head of file sys records */
+   } qsPtrRec_t;
+
+#endif
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+extern BOOL     fInited;                /* malloc.c */
+int             cObjectsFake = 14;
+OTE             aKrnlOTE[24];
+
+
+/*******************************************************************************
+*   External Functions                                                         *
+*******************************************************************************/
+#ifndef QS_MTE
+   /* from OS/2 Toolkit v4.5 */
+
+   APIRET APIENTRY DosQuerySysState(ULONG EntityList, ULONG EntityLevel, PID pid,
+                                    TID tid, PVOID pDataBuf, ULONG cbBuf);
+    #define QS_MTE         0x0004
+#endif
+
+
+/*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
 void    syntax(void);
+int     kernelInit(int iTest, int argc, char **argv);
 void    workersinit(void);
 void    initRPInit(RP32INIT *pRpInit, char *pszInitArgs);
 int     tests(int iTest, int argc, char **argv);
-int     TestCase1(void);
+int     TestCase1(int argc, char **argv);
 int     TestCase2(void);
 int     TestCase3(void);
 int     TestCase4(void);
 int     TestCase5(void);
+int     TestCase6(void);
 int     CompareOptions(struct options *pOpt);
-int     TestCaseExeLoad1(void);
-
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-extern BOOL     fInited;                /* malloc.c */
-const char *    pszInternalRevision = "\r\nInternal revision 14.040_W4";
-int             cObjectsFake = 14;
-
+int     TestCaseExeLoad2(void);
 
 
@@ -186 +294 @@
     workersinit();
 
+    /*
+     * Init Kernel
+     */
+    if (!kernelInit(iTest, argc, argv))
+        return -2;
 
     /*
@@ -219 +332 @@
 {
     printf(
-        "Win32kTst.exe v%d.%d.%d - Ring 3 testing of win32k.sys\n"
-        "syntax: Win32kTst.exe <testcase number> [optional arguments]\n",
-        0,0,4
+           "Win32kTst.exe v%d.%d.%d - Ring 3 testing of win32k.sys\n"
+           "syntax: Win32kTst.exe <testcase number> [optional arguments]\n",
+           0,0,4
            );
 }
@@ -227 +340 @@
 
 /**
- * Initiate workers (imported kernel functions / vars)
- * @status    partially implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
- */
-void  workersinit(void)
+ * test case 1: Load the specified kernel
+ * other cases: Load running kernel.
+ * @returns Success indicator. (true/false)
+ * @param   iTest   Testcase number.
+ * @param   argc    main argc
+ * @param   argv    main argv
+ * @status  completely implemented.
+ * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+int     kernelInit(int iTest, int argc, char **argv)
 {
-    DosSetMem(&CODE16START, &CODE16END - &CODE16START, PAG_WRITE | PAG_READ);
-    DosSetMem(&CODE32START, &CODE32END - &CODE32START, PAG_WRITE | PAG_READ);
+    static char     achBuffer[1024*256];
+    char            szError[256];
+    HMODULE         hmod = NULLHANDLE;
+    int             rc;
+    char            szName[CCHMAXPATH];
+    char *          pszSrcName;
+    char *          pszTmp;
+    ULONG           ulAction;
+    HFILE           hFile;
+    struct e32_exe* pe32 = (struct e32_exe*)(void*)&achBuffer[0];
+    qsPtrRec_t *    pPtrRec = (qsPtrRec_t*)(void*)&achBuffer[0];
+    qsLrec_t *      pLrec;
+    int             i;
+    FILESTATUS3     fsts3;
+
+    /*
+     * If not testcase 1, use the running kernel.
+     */
+    if (iTest != 1)
+    {
+        ULONG   ulBootDrv = 3;
+        pszSrcName = "c:\\os2krnl";
+        DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, SSToDS(&ulBootDrv), sizeof(ulBootDrv));
+        pszSrcName[0] = (char)(ulBootDrv + 'a' - 1);
+    }
+    else
+    {
+        if (argc < 3)
+        {
+            printf("Missing parameter!\n");
+            return FALSE;
+        }
+        pszSrcName = argv[2];
+    }
+
+    /*
+     * Make a temporary copy of the kernel.
+     */
+    if (DosScanEnv("TMP", &pszTmp) != NO_ERROR || pszTmp == NULL)
+    {
+        printf("Environment variable TMP is not set.\n");
+        return FALSE;
+    }
+    strcpy(szName, pszTmp);
+    if (szName[strlen(pszTmp) - 1] != '\\' && szName[strlen(pszTmp) - 1] != '/')
+        strcat(szName, "\\");
+    strcat(szName, "os2krnl");
+    rc = DosCopy(pszSrcName, szName, DCPY_EXISTING);
+    if (rc != NO_ERROR)
+    {
+        printf("Failed to copy %s to %s.\n", pszSrcName, szName);
+        return FALSE;
+    }
+    if (DosQueryPathInfo(szName, FIL_STANDARD, &fsts3, sizeof(fsts3)) != NO_ERROR
+        ||  !(fsts3.attrFile = FILE_ARCHIVED)
+        ||  DosSetPathInfo(szName, FIL_STANDARD, &fsts3, sizeof(fsts3), 0) != NO_ERROR
+        )
+    {
+        printf("Failed to set attributes for %s.\n", szName);
+        return FALSE;
+    }
+
+    /*
+     * Patch the kernel.
+     *      Remove the entrypoint.
+     */
+    ulAction = 0;
+    rc = DosOpen(szName, &hFile, &ulAction, 0, FILE_NORMAL,
+                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
+                 NULL);
+    if (rc != NO_ERROR)
+    {
+        printf("Failed to open temporary kernel file. rc = %d\n", rc);
+        return FALSE;
+    }
+    rc = DosRead(hFile, &achBuffer[0], 0x200, &ulAction);
+    if (rc != NO_ERROR)
+    {
+        DosClose(hFile);
+        printf("Failed to read LX header from temporary kernel file.\n");
+        return FALSE;
+    }
+    pe32 = (struct e32_exe*)(void*)&achBuffer[*(unsigned long*)(void*)&achBuffer[0x3c]];
+    if (*(PUSHORT)pe32->e32_magic != E32MAGIC)
+    {
+        DosClose(hFile);
+        printf("Failed to read LX header from temporary kernel file (2).\n");
+        return FALSE;
+    }
+    pe32->e32_eip = 0;
+    pe32->e32_startobj = 0;
+    pe32->e32_mflags &= ~(E32LIBTERM | E32LIBINIT);
+    if ((rc = DosSetFilePtr(hFile, *(unsigned long*)(void*)&achBuffer[0x3c], FILE_BEGIN, &ulAction)) != NO_ERROR
+        || (rc = DosWrite(hFile, pe32, sizeof(struct e32_exe), &ulAction)) != NO_ERROR)
+    {
+        DosClose(hFile);
+        printf("Failed to write patched LX header to temporary kernel file.\n");
+        return FALSE;
+    }
+    DosClose(hFile);
+
+    /*
+     * Load the module.
+     */
+    rc = DosLoadModule(szError, sizeof(szError), szName, SSToDS(&hmod));
+    if (rc != NO_ERROR && (rc != ERROR_INVALID_PARAMETER && hmod == NULLHANDLE))
+    {
+        printf("Failed to load OS/2 kernel image %s.");
+        return FALSE;
+    }
+
+    /*
+     * Get object information.
+     */
+    rc = DosQuerySysState(QS_MTE, QS_MTE, 0L, 0L, pPtrRec, sizeof(achBuffer));
+    if (rc != NO_ERROR)
+    {
+        printf("DosQuerySysState failed with rc=%d.\n", rc);
+        return FALSE;
+    }
+
+    pLrec = pPtrRec->pLibRec;
+    while (pLrec != NULL)
+    {
+        /*
+         * Bug detected in OS/2 FP13. Probably a problem which occurs
+         * in _LDRSysMteInfo when qsCheckCache is calle before writing
+         * object info. The result is that the cache flushed and the
+         * attempt of updating the qsLrec_t next and object pointer is
+         * not done. This used to work earlier and on Aurora AFAIK.
+         *
+         * The fix for this problem is to check if the pObjInfo is NULL
+         * while the number of objects isn't 0 and correct this. pNextRec
+         * will also be NULL at this time. This will be have to corrected
+         * before we exit the loop or moves to the next record.
+         * There is also a nasty alignment of the object info... Hope
+         * I got it right. (This aligment seems new to FP13.)
+         */
+        if (pLrec->pObjInfo == NULL /*&& pLrec->pNextRec == NULL*/ && pLrec->ctObj > 0)
+            {
+            pLrec->pObjInfo = (qsLObjrec_t*)(void*)(
+                (char*)(void*)pLrec
+                + ((sizeof(qsLrec_t)                            /* size of the lib record */
+                   + pLrec->ctImpMod * sizeof(short)            /* size of the array of imported modules */
+                   + strlen((char*)(void*)pLrec->pName) + 1     /* size of the filename */
+                   + 3) & ~3));                                 /* the size is align on 4 bytes boundrary */
+            pLrec->pNextRec = (qsLrec_t*)(void*)((char*)(void*)pLrec->pObjInfo
+                                                 + sizeof(qsLObjrec_t) * pLrec->ctObj);
+            }
+        if (pLrec->hmte == hmod)
+            break;
+
+        /*
+         * Next record
+         */
+        pLrec = (qsLrec_t*)pLrec->pNextRec;
+    }
+
+    if (pLrec == NULL)
+    {
+        printf("DosQuerySysState(os2krnl): not found\n");
+        return FALSE;
+    }
+    if (pLrec->pObjInfo == NULL)
+    {
+        printf("DosQuerySysState(os2krnl): no object info\n");
+        return FALSE;
+    }
+
+    /*
+     * Fill the aKrnlOTE array.
+     */
+    for (i = 0; i < pLrec->ctObj; i++)
+    {
+        aKrnlOTE[i].ote_size    = pLrec->pObjInfo[i].osize;
+        aKrnlOTE[i].ote_base    = pLrec->pObjInfo[i].oaddr;
+        aKrnlOTE[i].ote_flags   = pLrec->pObjInfo[i].oflags;
+        aKrnlOTE[i].ote_pagemap = i > 0 ? aKrnlOTE[i-1].ote_pagemap + aKrnlOTE[i-1].ote_mapsize : 0;
+        aKrnlOTE[i].ote_mapsize = (pLrec->pObjInfo[i].osize + 0x0FFF) / 0x1000;
+        aKrnlOTE[i].ote_sel     = (USHORT)FlatToSel(pLrec->pObjInfo[i].oaddr);
+        aKrnlOTE[i].ote_hob     = 0;
+    }
+    cObjectsFake = pLrec->ctObj;
+
+    return TRUE;
 }
 
@@ -273 +575 @@
     switch (iTest)
     {
-        case 1:     rc = TestCase1();   break;
+        case 1:     rc = TestCase1(argc, argv);   break;
         case 2:     rc = TestCase2();   break;
         case 3:     rc = TestCase3();   break;
-        case 4:     rc = TestCase4();   break;
-        case 5:     rc = TestCase5();   break;
 
         default:
@@ -294 +594 @@
 /**
  * Test case 1.
- * Checks that default initiation works fine for Aurora SMP kernels.
+ * Checks that default initiation works fine for a given kernel.
+ *
+ * Syntax:  win32ktst.exe 1 <os2krnl> <majorver> <minorver> <build> <kerneltype: S|U|4> <buildtype: A|H|R> [os2krnl.sym]
  *
  * @sketch  Create init packet with no arguments.
@@ -305 +607 @@
  * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
  */
-int TestCase1(void)
+int TestCase1(int argc, char **argv)
 {
+    static char szInitArgs[CCHMAXPATH + 10];
     int         rc = 1;
     RP32INIT    rpinit;
 
+    /* verify argument count */
+    if (argc < 8 || argc > 9)
+    {
+        printf("Invalid parameter count for testcase 1.\n");
+        return ERROR_INVALID_PARAMETER;
+    }
+
     /* init fake variabels */
-    pszInternalRevision ="\r\nInternal revision 14.040_SMP";
-    cObjectsFake = 15;
-    _usFakeVerMajor = 20;
-    _usFakeVerMinor = 45;
+    _usFakeVerMajor = (USHORT)atoi(argv[3]);
+    _usFakeVerMinor = (USHORT)atoi(argv[4]);
+
+    /* make init string */
+    strcpy(szInitArgs, "-w3");
+    if (argc >= 9)
+        strcat(strcat(szInitArgs, " -S:"), argv[8]);
 
     /* $elf */
-    initRPInit(SSToDS(&rpinit), "-w3");
+    initRPInit(SSToDS(&rpinit), szInitArgs);
     rc = InitElf(&rpinit);              /* no SSToDS! */
     printf("InitElf returned status=0x%04x\n", rpinit.rph.Status);
@@ -323 +636 @@
     {
         /* $win32k */
-        initRPInit(SSToDS(&rpinit), "-w3");
+        initRPInit(SSToDS(&rpinit), szInitArgs);
         rc = InitWin32k(&rpinit);       /* no SSToDS! */
         printf("InitWin32k returned status=0x%04x\n", rpinit.rph.Status);
@@ -329 +642 @@
         {
             struct options opt = DEFAULT_OPTION_ASSIGMENTS;
-            opt.fKernel = KF_SMP;
-            opt.ulBuild = 14040;
-            opt.usVerMajor = 20;
-            opt.usVerMinor = 45;
             opt.ulInfoLevel = 3;
+            opt.fKernel = (argv[6][0] == 'S' ? KF_SMP : (argv[6][0] == '4' ? KF_W4 | KF_UNI : KF_UNI))
+                            | (argv[7][0] == 'A' || argv[7][0] == 'H' ? KF_DEBUG : 0);
+            opt.ulBuild = atoi(argv[5]);
+            opt.usVerMajor = (USHORT)atoi(argv[3]);
+            opt.usVerMinor = (USHORT)atoi(argv[4]);
 
             rc = CompareOptions(SSToDS(&opt));
-            if (rc == NO_ERROR)
-            {
-                rc = TestCaseExeLoad1();
-            }
         }
         else
@@ -350 +660 @@
 }
 
-
 /**
  * Test case 2.
- * Checks that default initiation works fine for Aurora UNI kernels.
+ * Checks that all parameters are read correctly (1).
  *
  * @sketch  Create init packet with no arguments.
@@ -368 +677 @@
     int         rc = 1;
     RP32INIT    rpinit;
-
-    /* init fake variabels */
-    pszInternalRevision ="\r\nInternal revision 14.040_UNI";
-    cObjectsFake = 14;
-    _usFakeVerMajor = 20;
-    _usFakeVerMinor = 45;
+    char *      pszInitArgs = "-C1 -L:E -Verbose -Elf:Yes -Pe:Mixed -Script:Yes -W4 -Heap:512000 -ResHeap:0256000 -HeapMax:4096000 -ResHeapMax:0x100000";
+
+    options.fLogging = TRUE;
 
     /* $elf */
-    initRPInit(SSToDS(&rpinit), "");
+    initRPInit(SSToDS(&rpinit), pszInitArgs);
     rc = InitElf(&rpinit);              /* no SSToDS! */
     printf("InitElf returned status=0x%04x\n", rpinit.rph.Status);
@@ -382 +688 @@
     {
         /* $win32k */
-        initRPInit(SSToDS(&rpinit), "");
+        initRPInit(SSToDS(&rpinit), pszInitArgs);
         rc = InitWin32k(&rpinit);       /* no SSToDS! */
         printf("InitWin32k returned status=0x%04x\n", rpinit.rph.Status);
@@ -388 +694 @@
         {
             struct options opt = DEFAULT_OPTION_ASSIGMENTS;
-            opt.fKernel = KF_UNI;
-            opt.ulBuild = 14040;
-            opt.usVerMajor = 20;
-            opt.usVerMinor = 45;
+            opt.cbSwpHeapInit   = 512000;
+            opt.cbSwpHeapMax    = 4096000;
+            opt.cbResHeapInit   = 0256000;
+            opt.cbResHeapMax    = 0x100000;
+            opt.fElf            = TRUE;
+            opt.fUNIXScript     = TRUE;
+            opt.fPE             = FLAGS_PE_MIXED;
+            opt.fQuiet          = FALSE;
+            opt.fLogging        = TRUE;
+            opt.usCom           = OUTPUT_COM1;
+            opt.ulInfoLevel     = INFOLEVEL_INFOALL;
 
             rc = CompareOptions(SSToDS(&opt));
+            if (rc == NO_ERROR)
+            {
+                 rc = TestCaseExeLoad2();
+            }
         }
         else
@@ -404 +721 @@
 }
 
-
 /**
  * Test case 3.
- * Checks that default initiation works fine for Warp FP13 kernel.
+ * Checks that all parameters are read correctly (1).
  *
  * @sketch  Create init packet with no arguments.
@@ -422 +738 @@
     int         rc = 1;
     RP32INIT    rpinit;
-
-    /* init fake variabels */
-    pszInternalRevision ="\r\nInternal revision 14.040_W4";
-    cObjectsFake = 14;
-    _usFakeVerMajor = 20;
-    _usFakeVerMinor = 45;
-
-    /* $elf */
-    initRPInit(SSToDS(&rpinit), "");
-    rc = InitElf(&rpinit);              /* no SSToDS! */
-    printf("InitElf returned status=0x%04x\n", rpinit.rph.Status);
-    if ((rpinit.rph.Status & (STDON | STERR)) == STDON)
-    {
-        /* $win32k */
-        initRPInit(SSToDS(&rpinit), "");
-        rc = InitWin32k(&rpinit);       /* no SSToDS! */
-        printf("InitWin32k returned status=0x%04x\n", rpinit.rph.Status);
-        if ((rpinit.rph.Status & (STDON | STERR)) == STDON)
-        {
-            struct options opt = DEFAULT_OPTION_ASSIGMENTS;
-            opt.fKernel = KF_UNI | KF_W4;
-            opt.ulBuild = 14040;
-            opt.usVerMajor = 20;
-            opt.usVerMinor = 45;
-
-            rc = CompareOptions(SSToDS(&opt));
-        }
-        else
-            printf("!failed!\n");
-    }
-    else
-        printf("!failed!\n");
-
-    return rc;
-}
-
-
-/**
- * Test case 4.
- * Checks that default initiation works fine for Aurora SMP kernels.
- *
- * @sketch  Create init packet with no arguments.
- *          Initiate elf$
- *          Create init packet with no arguments.
- *          Initiate win32k$
- * @returns 0 on success.
- *          1 on failure.
- * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
- */
-int TestCase4(void)
-{
-    int         rc = 1;
-    RP32INIT    rpinit;
-
-    /* init fake variabels */
-    pszInternalRevision ="\r\nInternal revision 9.036";
-    cObjectsFake = 14;
-    _usFakeVerMajor = 20;
-    _usFakeVerMinor = 40;
-
-    /* $elf */
-    initRPInit(SSToDS(&rpinit), "");
-    rc = InitElf(&rpinit);              /* no SSToDS! */
-    printf("InitElf returned status=0x%04x\n", rpinit.rph.Status);
-    if ((rpinit.rph.Status & (STDON | STERR)) == STDON)
-    {
-        /* $win32k */
-        initRPInit(SSToDS(&rpinit), "");
-        rc = InitWin32k(&rpinit);       /* no SSToDS! */
-        printf("InitWin32k returned status=0x%04x\n", rpinit.rph.Status);
-        if ((rpinit.rph.Status & (STDON | STERR)) == STDON)
-        {
-            struct options opt = DEFAULT_OPTION_ASSIGMENTS;
-            opt.fKernel     = KF_UNI;
-            opt.ulBuild     = 9036;
-            opt.usVerMajor  = 20;
-            opt.usVerMinor  = 40;
-
-            rc = CompareOptions(SSToDS(&opt));
-        }
-        else
-            printf("!failed!\n");
-    }
-    else
-        printf("!failed!\n");
-
-    return rc;
-}
-
-
-/**
- * Test case 5.
- * Checks that all parameters are read correctly (1) (Warp FP13 kernel).
- *
- * @sketch  Create init packet with no arguments.
- *          Initiate elf$
- *          Create init packet with no arguments.
- *          Initiate win32k$
- * @returns 0 on success.
- *          1 on failure.
- * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
- */
-int TestCase5(void)
-{
-    int         rc = 1;
-    RP32INIT    rpinit;
-    char *      pszInitArgs = "-C1 -L:N -Verbose -Quiet -Elf:Yes -Pe:Mixed -Script:No -W4 -Heap:512000 -ResHeap:0256000 -HeapMax:4096000 -ResHeapMax:0x100000";
-
-    /* init fake variabels */
-    pszInternalRevision ="\r\nInternal revision 14.040_W4";
-    cObjectsFake = 14;
-    _usFakeVerMajor = 20;
-    _usFakeVerMinor = 45;
+    char *      pszInitArgs = "-C1 -L:N -Verbose -Quiet -Elf:Yes -Pe:PE -Script:Yes -Rexx:NES -Java:NYes -W4 -Heap:512000 -ResHeap:0256000 -HeapMax:4096000 -ResHeapMax:0x100000";
 
     /* $elf */
@@ -551 +753 @@
         {
             struct options opt = DEFAULT_OPTION_ASSIGMENTS;
-            opt.fKernel         = KF_UNI | KF_W4;
-            opt.ulBuild         = 14040;
-            opt.usVerMajor      = 20;
-            opt.usVerMinor      = 45;
             opt.cbSwpHeapInit   = 512000;
             opt.cbSwpHeapMax    = 4096000;
@@ -560 +758 @@
             opt.cbResHeapMax    = 0x100000;
             opt.fElf            = TRUE;
-            opt.fUNIXScript     = FALSE;
-            opt.fPE             = FLAGS_PE_MIXED;
+            opt.fUNIXScript     = TRUE;
+            opt.fJava           = FALSE;
+            opt.fREXXScript     = FALSE;
+            opt.fPE             = FLAGS_PE_PE;
             opt.fQuiet          = TRUE;
             opt.fLogging        = FALSE;
@@ -568 +768 @@
 
             rc = CompareOptions(SSToDS(&opt));
+            if (rc == NO_ERROR)
+            {
+                 rc = TestCaseExeLoad2();
+            }
         }
         else
@@ -577 +781 @@
     return rc;
 }
+
 
 /**
@@ -598 +803 @@
     if (options.fLogging != pOpt->fLogging)
         printf("fLogging = %d - should be %d\n", options.fLogging, pOpt->fLogging, rc++);
-    if (options.fKernel != pOpt->fKernel)
-        printf("fKernel = %d - should be %d\n", options.fKernel, pOpt->fKernel, rc++);
-    if (options.ulBuild != pOpt->ulBuild)
-        printf("ulBuild = %d - should be %d\n", options.ulBuild, pOpt->ulBuild, rc++);
-    if (options.usVerMajor != pOpt->usVerMajor)
-        printf("usVerMajor = %d - should be %d\n", options.usVerMajor, pOpt->usVerMajor, rc++);
-    if (options.usVerMinor != pOpt->usVerMinor)
-        printf("usVerMinor = %d - should be %d\n", options.usVerMinor, pOpt->usVerMinor, rc++);
+    if (pOpt->ulBuild != ~0UL)
+    {
+        if (options.fKernel != pOpt->fKernel)
+            printf("fKernel = %d - should be %d\n", options.fKernel, pOpt->fKernel, rc++);
+        if (options.ulBuild != pOpt->ulBuild)
+            printf("ulBuild = %d - should be %d\n", options.ulBuild, pOpt->ulBuild, rc++);
+        if (options.usVerMajor != pOpt->usVerMajor)
+            printf("usVerMajor = %d - should be %d\n", options.usVerMajor, pOpt->usVerMajor, rc++);
+        if (options.usVerMinor != pOpt->usVerMinor)
+            printf("usVerMinor = %d - should be %d\n", options.usVerMinor, pOpt->usVerMinor, rc++);
+    }
     if (options.fPE != pOpt->fPE)
         printf("fPE = %d - should be %d\n", options.fPE, pOpt->fPE, rc++);
@@ -633 +841 @@
 
 
-
-
 /**
  * Simulates a executable loading (no errors).
@@ -647 +853 @@
  * @remark
  */
-int TestCaseExeLoad1(void)
+int TestCaseExeLoad2(void)
 {
     APIRET rc;
+    int    cch;
+    char * psz;
 
     /*
@@ -658 +866 @@
      * Do the real execution.
      */
-    printf("--- TestcaseExeLoad1 - loading win32ktst.exe (LX image) ----\n");
+    printf("--- TestcaseExeLoad2 - loading win32ktst.exe (LX image) ----\n");
     rc = CalltkExecPgm(EXEC_LOAD, NULL, NULL, "win32ktst.exe");
     if (rc == NO_ERROR)
     {
-        printf("--- TestcaseExeLoad1 - loading libconv.exe (LX image) ----\n");
+        psz = "BIN\\DEBUG\\LIBCONV.EXE\0";
+        printf("--- TestcaseExeLoad2 - loading libconv.exe (LX image) ----\n");
         rc = CalltkExecPgm(EXEC_LOAD, NULL, NULL, "bin\\debug\\libconv.exe");
+        if (rc == NO_ERROR)
+        {
+            #if 0 //not implemented by CalltkExecPgm...???
+            /* check result */
+            if (memcmp(achTkExecPgmArguments, psz, strlen(psz) + 1) != 0)
+            {
+                rc  = ERROR_BAD_ARGUMENTS;
+                printf("Bad Arguments! (%s)\n", achTkExecPgmArguments);
+            }
+            #else
+            psz = psz;
+            #endif
+        }
     }
 
     if (rc == NO_ERROR)
     {
-        printf("--- TestcaseExeLoad1 - loading rexx\\tst.cmd (REXX script) ----\n");
-        rc = CalltkExecPgm(EXEC_LOAD, NULL, NULL, "rexx\\tst.cmd");
+        psz = "REXX\\TST.RX\0OriginalArgument1 OriginalArgument2\0OriginalArgument3\0";
+        printf("--- TestcaseExeLoad2 - loading rexx\\tst.rx (REXX script) ----\n");
+        rc = CalltkExecPgm(EXEC_LOAD, psz, NULL, "rexx\\tst.rx");
+        if (rc == NO_ERROR)
+        {
+            /* check result */
+            psz = "REXX\\TST.RX OriginalArgument1 OriginalArgument2\0OriginalArgument3\0";
+            cch = strlen(psz);
+            if (memcmp(achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1, psz, cch) != 0)
+            {
+                rc  = ERROR_BAD_ARGUMENTS;
+                printf("Bad Arguments! (achTkExecPgmArguments=%s).\n", achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1);
+            }
+        }
     }
 
     if (rc == NO_ERROR)
     {
-        printf("--- TestcaseExeLoad1 - loading SOL.EXE (PE image) ----\n");
-        rc = CalltkExecPgm(EXEC_LOAD, NULL, NULL, "e:\\Win32Prog\\Sol\\Sol.exe");
+        psz = "TEST\\TST.SH\0OrgArg1 OrgArg2\0OrgArg3\0";
+        printf("--- TestcaseExeLoad2 - loading test\\tst.sh (UNIX shell script) ----\n");
+        rc = CalltkExecPgm(EXEC_LOAD, psz, NULL, "test\\tst.sh");
+        if (rc == NO_ERROR)
+        {
+            /* check result */
+            psz = "TEST\\TST.SH OrgArg1 OrgArg2\0OrgArg3\0";
+            cch = strlen(psz);
+            if (memcmp(achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1, psz, cch) != 0)
+            {
+                rc  = ERROR_BAD_ARGUMENTS;
+                printf("Bad Arguments! (achTkExecPgmArguments=%s).\n", achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1);
+            }
+        }
+    }
+
+    if (rc == NO_ERROR)
+    {
+        psz = "TEST\\TST2.SH\0OrgArg1 OrgArg2\0OrgArg3\0";
+        printf("--- TestcaseExeLoad2 - loading test\\tst2.sh (UNIX shell script) ----\n");
+        rc = CalltkExecPgm(EXEC_LOAD, psz, NULL, "test\\tst2.sh");
+        if (rc == NO_ERROR)
+        {
+            /* check result */
+            psz = "-arg1 -arg2 -arg3 TEST\\TST2.SH OrgArg1 OrgArg2\0OrgArg3\0";
+            cch = strlen(psz) + 1;
+            if (memcmp(achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1, psz, cch) != 0)
+            {
+                rc  = ERROR_BAD_ARGUMENTS;
+                printf("Bad Arguments! (achTkExecPgmArguments=%s).\n", achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1);
+            }
+        }
+    }
+
+    if (rc == NO_ERROR)
+    {
+        psz = "E:\\WIN32PROG\\SOL\\SOL.EXE\0";
+        printf("--- TestcaseExeLoad2 - loading SOL.EXE (PE image) ----\n");
+        rc = CalltkExecPgm(EXEC_LOAD, psz, NULL, "e:\\Win32Prog\\Sol\\Sol.exe");
+        if (rc == NO_ERROR)
+        {
+            /* check result */
+            cch = strlen(psz) + 1 + 1;
+            if (memcmp(achTkExecPgmArguments, psz, cch) != 0)
+            {
+                rc  = ERROR_BAD_ARGUMENTS;
+                printf("Bad Arguments! (achTkExecPgmArguments=%s).\n", achTkExecPgmArguments + strlen(achTkExecPgmArguments) + 1);
+            }
+        }
     }
 
@@ -683 +964 @@
     return rc;
 }
+