Changeset 2874

Timestamp:

Nov 12, 2006, 8:34:03 AM (19 years ago)

Author:

bird

Message:

windows exe stub.

Location:

trunk/kLdr

Files:

• Makefile.kmk (modified) (1 diff)
• kLdr-win.def (modified) (1 diff)
• kLdr.h (modified) (1 diff)
• kLdrDyld.c (modified) (1 diff)
• kLdrExeStub-win.c (added)

trunk/kLdr/Makefile.kmk

@@ -132 +132 @@
 kLdrExeStub-os2_SOURCES = kLdrExeStub-os2.asm
 
+#
+# The Windows stub program.
+#
+PROGRAMS.win = kLdrExeStub-win
+PROGRAMS.win32 = kLdrExeStub-win
+PROGRAMS.win64 = kLdrExeStub-win
+kLdrExeStub-win_TOOL = VCC70
+kLdrExeStub-win_SDKS = WIN32SDK
+kLdrExeStub-win_INCS = .
+kLdrExeStub-win_DEFS = __WIN__
+kLdrExeStub-win_CFLAGS = -W3 -Zl
+kLdrExeStub-win_CFLAGS.debug = -Zi
+kLdrExeStub-win_LDFLAGS = -Entry:WinMain -FIXED:NO
+kLdrExeStub-win_LIBS = $(TARGET_kLdr:.dll=.lib)
+kLdrExeStub-win_SOURCES = kLdrExeStub-win.c
+
+
 ##
 ## The (stub) utility.

trunk/kLdr/kLdr-win.def

@@ -73 +73 @@
 
     ; Process Bootstrapping
-;    kLdrDyldLoadExe
+    kLdrDyldLoadExe
+
+    ; Dynamic loading
     kLdrDyldLoad
     kLdrDyldUnload

trunk/kLdr/kLdr.h

@@ -934 +934 @@
     char            szLibPath[4096 - sizeof(uint32_t) - sizeof(KLDRDYLDSEARCH) - 16 - 16 - 260];
 } KLDREXEARGS, *PKLDREXEARGS;
+/** Pointer to a const argument package from the stub. */
+typedef const KLDREXEARGS *PCKLDREXEARGS;
 
 void kLdrLoadExe(PKLDREXEARGS pArgs, void *pvOS);

trunk/kLdr/kLdrDyld.c

@@ -227 +227 @@
  *
  * @param   pArgs       Pointer to the argument package residing in the executable stub.
- */
-void kldrDoDyldLoadExe(PKLDREXEARGS pArgs)
+ * @param   pvOS        OS specific argument.
+ */
+#ifndef __OS2__
+void kLdrDyldLoadExe(PKLDREXEARGS pArgs, void *pvOS)
+#else
+void kldrDyldLoadExe(PKLDREXEARGS pArgs, void *pvOS)
+#endif
 {
     void *pvStack;