Changeset 2982 for trunk/include

Timestamp:

Mar 3, 2000, 12:14:24 PM (26 years ago)

Author:

sandervl

Message:

updates

Location:

trunk/include

Files:

• os2wrap.h (modified) (2 diffs)
• win32api.h (added)
• win32type.h (modified) (2 diffs)
• winconst.h (modified) (2 diffs)

trunk/include/os2wrap.h

@@ -1 @@
-/* $Id: os2wrap.h,v 1.13 1999-12-15 09:25:12 achimha Exp $ */
+/* $Id: os2wrap.h,v 1.14 2000-03-03 11:14:22 sandervl Exp $ */
 #ifndef __OS2WRAP_H__
 #define __OS2WRAP_H__
@@ -8 +8 @@
 
 #if (__IBMC__ > 300)
-// VA3.6: inline is a C++ keywork, must be translated to _inline or _Inline or __inline in C code
+// VA3.6: inline is a C++ keyword, must be translated to _inline or _Inline or __inline in C code
 #define inline _inline
 #endif
 
 #ifdef INCL_DOSMEMMGR
+
+APIRET APIENTRY DosAliasMem(PVOID pb, ULONG cb, PPVOID ppbAlias, ULONG fl);
+
+inline APIRET _DosAliasMem(PVOID pb, ULONG cb, PPVOID ppbAlias, ULONG fl)
+{
+ APIRET yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = DosAliasMem(pb, cb, ppbAlias, fl);
+    SetFS(sel);
+
+    return yyrc;
+} 
+
+#undef  DosAliasMem
+#define DosAliasMem _DosAliasMem
+
 inline ULONG _DosAllocMem(PPVOID a, ULONG b, ULONG c)
 {

trunk/include/win32type.h

@@ -1 @@
-/* $Id: win32type.h,v 1.34 2000-03-01 13:31:36 sandervl Exp $ */
+/* $Id: win32type.h,v 1.35 2000-03-03 11:14:24 sandervl Exp $ */
 
 /*
@@ -363 +363 @@
 #define HQUEUE16 WORD
 
+typedef unsigned long HKEY;
+typedef HKEY* LPHKEY;
+typedef DWORD REGSAM;
+
 // other
 #ifndef HWND

trunk/include/winconst.h

@@ -1 @@
-/* $Id: winconst.h,v 1.26 2000-02-15 14:38:07 sandervl Exp $ */
+/* $Id: winconst.h,v 1.27 2000-03-03 11:14:24 sandervl Exp $ */
 
 /*
@@ -1058 +1058 @@
 #define SND_PURGE_W             0x00000040L /* purge all sounds */
 #define SND_APPLICATION_W       0x00000080L /* look for application specific association */
+
+
+#define REG_NONE                         0  /* no type */
+#define REG_SZ                           1  /* string type (ASCII) */
+#define REG_EXPAND_SZ                    2  /* string, includes %ENVVAR% (expanded by caller) (ASCII) */
+#define REG_BINARY                       3  /* binary format, callerspecific */
+                                /* YES, REG_DWORD == REG_DWORD_LITTLE_ENDIAN */
+#define REG_DWORD                        4  /* DWORD in little endian format */
+#define REG_DWORD_LITTLE_ENDIAN          4  /* DWORD in little endian format */
+#define REG_DWORD_BIG_ENDIAN             5  /* DWORD in big endian format  */
+#define REG_LINK                         6  /* symbolic link (UNICODE) */
+#define REG_MULTI_SZ                     7  /* multiple strings, delimited by \0, terminated by \0\0 (ASCII) */
+#define REG_RESOURCE_LIST                8  /* resource list? huh? */
+#define REG_FULL_RESOURCE_DESCRIPTOR     9  /* full resource descriptor? huh? */
+
+#define KEY_ALL_ACCESS 0x0000003f
+
+#define HKEY_CLASSES_ROOT       ((HKEY) 0x80000000)
+#define HKEY_CURRENT_USER       ((HKEY) 0x80000001)
+#define HKEY_LOCAL_MACHINE      ((HKEY) 0x80000002)
+#define HKEY_USERS              ((HKEY) 0x80000003)
+#define HKEY_PERFORMANCE_DATA   ((HKEY) 0x80000004)
+#define HKEY_CURRENT_CONFIG     ((HKEY) 0x80000005)
+#define HKEY_DYN_DATA           ((HKEY) 0x80000006)