Changeset 123 for trunk/include

Timestamp:

Jun 19, 1999, 3:57:51 PM (26 years ago)

Author:

sandervl

Message:

Changes for Win32 TIB allocation (not activated)

Location:

trunk/include

Files:

• os2newapi.h (modified) (2 diffs)
• win/module.h (modified) (3 diffs)
• win/thread.h (modified) (2 diffs)
• win/winprocess.h (modified) (2 diffs)

trunk/include/os2newapi.h

@@ -1 @@
-/* $Id: os2newapi.h,v 1.1 1999-06-19 10:53:36 sandervl Exp $ */
+/* $Id: os2newapi.h,v 1.2 1999-06-19 13:57:50 sandervl Exp $ */
 /*
  *
@@ -20 +20 @@
 #endif
 
+#ifdef INCL_DOSSEL
+/* Segment attribute flags (used with DosAllocSeg) */
+
+#define SEG_NONSHARED       0x0000
+#define SEG_GIVEABLE        0x0001
+#define SEG_GETTABLE        0x0002
+#define SEG_DISCARDABLE     0x0004
+
+#define DosAllocSeg     Dos16AllocSeg
+#define DosFreeSeg      Dos16FreeSeg
+#define DosGetSeg       Dos16GetSeg
+#define DosGiveSeg      Dos16GiveSeg
+#define DosReallocSeg   Dos16ReallocSeg
+#define DosSizeSeg      Dos16SizeSeg
+
+USHORT APIENTRY16 DosAllocSeg(USHORT cbSize, PSEL pSel, USHORT fsAlloc);
+USHORT APIENTRY16 DosFreeSeg(SEL sel);
+USHORT APIENTRY16 DosGetSeg(SEL sel);
+USHORT APIENTRY16 DosGiveSeg(SEL sel, PID pid, PSEL pSelRecipient);
+USHORT APIENTRY16 DosReallocSeg(USHORT cbNewSize, SEL sel);
+USHORT APIENTRY16 DosSizeSeg(SEL sel, PULONG pcbSize);
+
+#define DosSelToFlat Dos32SelToFlat
+ULONG _Optlink DosSelToFlat(ULONG seladdr);
+
+#define DosFlatToSel Dos32FlatToSel
+ULONG _Optlink DosFlatToSel(ULONG lin);
+
+#endif
+
 #endif //__OS2SEL_H__

trunk/include/win/module.h

@@ -1 @@
-/* $Id: module.h,v 1.1 1999-05-24 20:19:14 ktk Exp $ */
+/* $Id: module.h,v 1.2 1999-06-19 13:57:50 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
 
 #include "windef.h"
-#include "dosexe.h"
+//#include "dosexe.h"
 #include "pe_image.h"
 
+#ifndef __WIN32OS2__
   /* In-memory module structure. See 'Windows Internals' p. 219 */
 typedef struct _NE_MODULE
@@ -57 +58 @@
     LPVOID  hRsrcMap;         /* HRSRC 16->32 map (for 32-bit modules) */
 } NE_MODULE;
-
+#endif
 
 typedef struct {

trunk/include/win/thread.h

@@ -1 @@
-/* $Id: thread.h,v 1.1 1999-05-24 20:19:20 ktk Exp $ */
+/* $Id: thread.h,v 1.2 1999-06-19 13:57:50 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
 #include "config.h"
 #include "winbase.h"
-#include "selectors.h"  /* for SET_FS */
+//#include "selectors.h"  /* for SET_FS */
 
 struct _PDB;

trunk/include/win/winprocess.h

@@ -1 @@
-/* $Id: winprocess.h,v 1.1 1999-05-24 20:19:22 ktk Exp $ */
+/* $Id: winprocess.h,v 1.2 1999-06-19 13:57:50 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
 
 #include "windef.h"
-#include "module.h"
+//#include "module.h"
+
+//TODO: Fix this
+typedef ULONG WINE_MODREF;
 
 struct _NE_MODULE;