Changeset 21424

Timestamp:

Aug 24, 2010, 1:41:28 AM (15 years ago)

Author:

dmik

Message:

Added wrappers for DosQueryModFromEIP and DosQuerySysState and added compiling emxomfld-friendly wrapper libraries.

Location:

trunk

Files:

• include/os2wrap.h (modified) (2 diffs)
• src/libwrap/_DosQueryModFromEIP.asm (added)
• src/libwrap/_DosQuerySysState.asm (added)
• src/libwrap/libwrap0.mak (modified) (3 diffs)
• src/libwrap/libwrap1.mak (modified) (5 diffs)
• src/libwrap/makefile (modified) (1 diff)

trunk/include/os2wrap.h

@@ -428 +428 @@
 #define DosLoadModule _DosLoadModule
 
+ULONG APIENTRY _DosQueryModFromEIP(PHMODULE a, PULONG b, ULONG c, PCHAR d, PULONG e, ULONG f);
+
+#undef  DosQueryModFromEIP
+#define DosQueryModFromEIP _DosQueryModFromEIP
+
 ULONG APIENTRY _DosQueryModuleHandle(PCSZ a, PHMODULE b);
 
@@ -987 +992 @@
 
 #endif
+#ifdef INCL_DOSPROFILE
+ULONG APIENTRY _DosQuerySysState(ULONG a, ULONG b, PID c, TID d, PVOID e, ULONG f);
+
+#undef  DosQuerySysState
+#define DosQuerySysState _DosQuerySysState
+
+#endif
 #ifdef INCL_RXSUBCOM
 ULONG APIENTRY _RexxDeregisterSubcom(PCSZ a, PCSZ b);

trunk/src/libwrap/libwrap0.mak

@@ -12 +12 @@
 #
 LIBTARGET = 1
-EXETARGET = 1
 PUBLICLIB = 1
 
@@ -20 +19 @@
 #
 !include ../../makefile.inc
+
+
+#
+# Reuse the VAC object directory when building a wrapper library
+# compatible with emxomfld (object files are always the same)
+#
+!if "$(CCENV)" == "EMX"
+DIREXT =
+!endif
 
 
@@ -710 +718 @@
 
 
+!if "$(CCENV)" == "EMX"
+TARGET  = emxlibwrap0
+!else
 TARGET  = libwrap0
+!endif
 
 

trunk/src/libwrap/libwrap1.mak

@@ -12 +12 @@
 #
 LIBTARGET = 1
-EXETARGET = 1
 PUBLICLIB = 1
 
@@ -20 +19 @@
 #
 !include ../../makefile.inc
+
+
+#
+# Reuse the VAC object directory when building a wrapper library
+# compatible with emxomfld (object files are always the same)
+#
+!if "$(CCENV)" == "EMX"
+DIREXT =
+!endif
 
 
@@ -158 +166 @@
 $(OBJDIR)\_DosQueryMem.obj \
 $(OBJDIR)\_DosQueryMessageCP.obj \
+$(OBJDIR)\_DosQueryModFromEIP.obj \
 $(OBJDIR)\_DosQueryModuleHandle.obj \
 $(OBJDIR)\_DosQueryModuleName.obj \
@@ -172 +181 @@
 $(OBJDIR)\_DosQueryResourceSize.obj \
 $(OBJDIR)\_DosQuerySysInfo.obj \
+$(OBJDIR)\_DosQuerySysState.obj \
 $(OBJDIR)\_DosQueryThreadContext.obj \
 $(OBJDIR)\_DosQueryVerify.obj \
@@ -949 +959 @@
 
 
+!if "$(CCENV)" == "EMX"
+TARGET  = emxlibwrap1
+!else
 TARGET  = libwrap1
+!endif
 
 

trunk/src/libwrap/makefile

@@ -23 +23 @@
     $(MAKE_CMD) -f libwrap0.mak $@
     $(MAKE_CMD) -f libwrap1.mak $@
+    $(MAKE_CMD) CCENV=EMX -f libwrap0.mak $@
+    $(MAKE_CMD) CCENV=EMX -f libwrap1.mak $@
 
 # don't have to make deps more than once.