Changeset 2885

Timestamp:

Nov 18, 2006, 3:46:02 PM (19 years ago)

Author:

bird

Message:

Make testcase build

Location:

trunk/kLdr/testcase

Files:

• Makefile.kmk (modified) (6 diffs)
• tst.h (modified) (2 diffs)
• tstDllMain.c (modified) (1 diff)
• tstDllMainStub-os2.asm (added)
• tstExeMainStub-os2.asm (added)

trunk/kLdr/testcase/Makefile.kmk

@@ -98 +98 @@
   TEMPLATE_TSTBARE_TOOL = GCC3OMF
   TEMPLATE_TSTBARE_ASFLAGS = -f obj
-  TEMPLATE_TSTBARE_LIBS = os2 gcc end
+  TEMPLATE_TSTBARE_ASTOOL = NASM
+  TEMPLATE_TSTBARE_DEFS = main=main_wrapped
+  TEMPLATE_TSTBARE_LIBS = os2
  else
   TEMPLATE_TSTBARE_TOOL = GCC3
@@ -142 +144 @@
 tst-0-a_TEMPLATE = TSTBAREDLL
 tst-0-a_SOURCES  = tst-0-a.c tstDllMainStub.c
+tst-0-a_SOURCES.os2= tstDllMainStub-os2.asm
 
 tst-0-b_TEMPLATE = TSTBAREDLL
 tst-0-b_SOURCES  = tst-0-b.c tstDllMainStub.c
+tst-0-b_SOURCES.os2= tstDllMainStub-os2.asm
 
 tst-0-c_TEMPLATE = TSTBAREDLL
 tst-0-c_SOURCES  = tst-0-c.c tstDllMainStub.c
+tst-0-c_SOURCES.os2= tstDllMainStub-os2.asm
 
 tst-0-d_TEMPLATE = TSTBAREDLL
 tst-0-d_SOURCES  = tst-0-d.c tstDllMainStub.c
+tst-0-d_SOURCES.os2= tstDllMainStub-os2.asm
 
 tst-0_TEMPLATE   = TSTBAREPROG
 tst-0_SOURCES    = tst-0.c tstExeMainStub.c
+tst-0_SOURCES.os2= tstExeMainStub-os2.asm
 
 ifeq ($(filter-out nt win win32 win64,$(BUILD_TARGET)),)
@@ -162 +169 @@
 tst-0_LIBS       = $(TARGET_tst-0-a:.dll=.lib) $(TARGET_tst-0-b:.dll=.lib) $(TARGET_tst-0-c:.dll=.lib)
 else
-tst-0-a_LIBS     = $(TARGET_tst-0-a:-a=-d)
-tst-0-b_LIBS     = $(TARGET_tst-0-b:-b=-d)
-tst-0-c_LIBS     = $(TARGET_tst-0-c:-c=-d)
+tst-0-driver_LIBS.os2 = $(PATH_DLL)/kLdr.dll
+tst-0-a_LIBS     = $(subst -a,-d,$(TARGET_tst-0-a))
+tst-0-b_LIBS     = $(subst -b,-d,$(TARGET_tst-0-b))
+tst-0-c_LIBS     = $(subst -c,-d,$(TARGET_tst-0-c))
 tst-0_LIBS       = $(TARGET_tst-0-a) $(TARGET_tst-0-b) $(TARGET_tst-0-c)
 endif
@@ -196 +204 @@
 tst-1_LIBS       = $(TARGET_tst-1-a:.dll=.lib) $(TARGET_tst-1-b:.dll=.lib) $(TARGET_tst-1-c:.dll=.lib)
 else
-tst-1-a_LIBS     = $(TARGET_tst-1-a:-a=-d)
-tst-1-b_LIBS     = $(TARGET_tst-1-b:-b=-d)
-tst-1-c_LIBS     = $(TARGET_tst-1-c:-c=-d)
+tst-1-a_LIBS     = $(subst -a,-d,$(TARGET_tst-1-a))
+tst-1-b_LIBS     = $(subst -b,-d,$(TARGET_tst-1-b))
+tst-1-c_LIBS     = $(subst -c,-d,$(TARGET_tst-1-c))
 tst-1_LIBS       = $(TARGET_tst-1-a) $(TARGET_tst-1-b) $(TARGET_tst-1-c)
 endif
@@ -230 +238 @@
 tst-2_LIBS       = $(TARGET_tst-2-b:.dll=.lib) $(TARGET_tst-2-c:.dll=.lib) $(TARGET_tst-2-d:.dll=.lib) $(TARGET_tst-2-a:.dll=.lib)
 else
-tst-2-b_LIBS     = $(TARGET_tst-2-b:-b=-a)
-tst-2-c_LIBS     = $(TARGET_tst-2-c:-c=-a)
-tst-2-d_LIBS     = $(TARGET_tst-2-d:-d=-a)
+tst-2-b_LIBS     = $(subst -b,-a,$(TARGET_tst-2-b))
+tst-2-c_LIBS     = $(subst -c,-a,$(TARGET_tst-2-c))
+tst-2-d_LIBS     = $(subst -d,-a,$(TARGET_tst-2-d))
 tst-2_LIBS       = $(TARGET_tst-2-a) $(TARGET_tst-2-b) $(TARGET_tst-2-c) $(TARGET_tst-2-d)
 endif
@@ -241 +249 @@
 include $(PATH_KBUILD)/footer.kmk
 
-#$(error tst-2-a_LIBS=$(tst-2-a_LIBS))

trunk/kLdr/testcase/tst.h

@@ -35 +35 @@
 #if defined(__OS2__) || defined(__WIN__) || defined(__NT__)
 # define MY_EXPORT(type) __declspec(dllexport) type
-//# define MY_IMPORT(type) extern __declspec(dllimport) type
+/*# define MY_IMPORT(type) extern __declspec(dllimport) type*/
 # define MY_IMPORT(type) extern type
 #else
@@ -43 +43 @@
 
 #if defined(__OS2__)
-# define MY_NAME(a) "_"##a
+# define MY_NAME(a) "_" a
 #else
 # define MY_NAME(a) a
 #endif
-
 
 extern const char *g_pszName;

trunk/kLdr/testcase/tstDllMain.c

@@ -55 +55 @@
  * OS/2 DLL 'main'
  */
-ULONG _System _DLL_InitTerm(HMODULE hmod, ULONG fFlag)
+ULONG _System _DLL_InitTerm(HMODULE hmod, ULONG fFlags)
 {
     switch (fFlags)