Changeset 1898

Timestamp:

Nov 30, 1999, 9:20:31 PM (26 years ago)

Author:

sandervl

Message:

compilation fixes

Location:

trunk

Files:

• include/win/windef.h (modified) (2 diffs)
• include/win/wine/obj_control.h (modified) (2 diffs)
• include/win/winnt.h (modified) (5 diffs)
• src/NTDLL/exception.cpp (modified) (2 diffs)
• src/crtdll/crtdll.cpp (modified) (3 diffs)
• src/kernel32/KERNEL32.CPP (modified) (2 diffs)
• src/kernel32/thread.cpp (modified) (2 diffs)
• src/kernel32/wintls.cpp (modified) (2 diffs)
• tools/wrc/makefile.os2 (modified) (1 diff)

trunk/include/win/windef.h

@@ -1 @@
-/* $Id: windef.h,v 1.16 1999-11-30 19:38:23 sandervl Exp $ */
+/* $Id: windef.h,v 1.17 1999-11-30 20:19:02 sandervl Exp $ */
 
 /*
@@ -213 +213 @@
 typedef WORD            CATCHBUF[9];
 typedef WORD           *LPCATCHBUF;
-typedef DWORD           ACCESS_MASK;
-typedef ACCESS_MASK     REGSAM;
+typedef DWORD           REGSAM;
 typedef HANDLE          HHOOK;
 typedef HANDLE          HKEY;

trunk/include/win/wine/obj_control.h

@@ -1 @@
-/* $Id: obj_control.h,v 1.6 1999-09-02 20:56:30 phaller Exp $ */
+/* $Id: obj_control.h,v 1.7 1999-11-30 20:19:03 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
@@ -45 +45 @@
         DWORD clSize;
         DWORD rpcReserved;
-        ULONGLONG_W ahData[1];
+        ULONGLONG ahData[1];
 } wireVARIANT_BLOB;
 

trunk/include/win/winnt.h

@@ -785 +785 @@
 #define MAXIMUM_SUSPEND_COUNT 127
 
+#define EXCEPTION_ACCESS_VIOLATION          STATUS_ACCESS_VIOLATION
+#define EXCEPTION_DATATYPE_MISALIGNMENT     STATUS_DATATYPE_MISALIGNMENT
+#define EXCEPTION_BREAKPOINT                STATUS_BREAKPOINT
+#define EXCEPTION_SINGLE_STEP               STATUS_SINGLE_STEP
+#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED     STATUS_ARRAY_BOUNDS_EXCEEDED
+#define EXCEPTION_FLT_DENORMAL_OPERAND      STATUS_FLOAT_DENORMAL_OPERAND
+#define EXCEPTION_FLT_DIVIDE_BY_ZERO        STATUS_FLOAT_DIVIDE_BY_ZERO
+#define EXCEPTION_FLT_INEXACT_RESULT        STATUS_FLOAT_INEXACT_RESULT
+#define EXCEPTION_FLT_INVALID_OPERATION     STATUS_FLOAT_INVALID_OPERATION
+#define EXCEPTION_FLT_OVERFLOW              STATUS_FLOAT_OVERFLOW
+#define EXCEPTION_FLT_STACK_CHECK           STATUS_FLOAT_STACK_CHECK
+#define EXCEPTION_FLT_UNDERFLOW             STATUS_FLOAT_UNDERFLOW
+#define EXCEPTION_INT_DIVIDE_BY_ZERO        STATUS_INTEGER_DIVIDE_BY_ZERO
+#define EXCEPTION_INT_OVERFLOW              STATUS_INTEGER_OVERFLOW
+#define EXCEPTION_PRIV_INSTRUCTION          STATUS_PRIVILEGED_INSTRUCTION
+#define EXCEPTION_IN_PAGE_ERROR             STATUS_IN_PAGE_ERROR
+#define EXCEPTION_ILLEGAL_INSTRUCTION       STATUS_ILLEGAL_INSTRUCTION
+#define EXCEPTION_NONCONTINUABLE_EXCEPTION  STATUS_NONCONTINUABLE_EXCEPTION
+#define EXCEPTION_STACK_OVERFLOW            STATUS_STACK_OVERFLOW
+#define EXCEPTION_INVALID_DISPOSITION       STATUS_INVALID_DISPOSITION
+#define EXCEPTION_GUARD_PAGE                STATUS_GUARD_PAGE_VIOLATION
+#define EXCEPTION_INVALID_HANDLE            STATUS_INVALID_HANDLE
+#define CONTROL_C_EXIT                      STATUS_CONTROL_C_EXIT
+
+/* Wine extension; Windows doesn't have a name for this code */
+#define EXCEPTION_CRITICAL_SECTION_WAIT     0xc0000194
+
 
 /*
@@ -870 +897 @@
  */
 
-typedef LONG (CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
+typedef LONG (* CALLBACK PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
 typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
 
@@ -1006 +1033 @@
 
 typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
-typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;
+typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL, *LPSECURITY_DESCRIPTOR;
 
 /* The security descriptor structure */
@@ -1056 +1083 @@
  * LUID_AND_ATTRIBUTES
  */
-
+#ifdef __WIN32OS2__
+typedef union _LARGE_INTEGER {
+        DWORD    LowPart;
+        LONG     HighPart;
+} LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER;
+
+typedef union _ULARGE_INTEGER {
+        DWORD    LowPart;
+        LONG     HighPart;
+} ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
+#else
 typedef union _LARGE_INTEGER {
     struct {
@@ -1072 +1109 @@
     LONGLONG QuadPart;
 } ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
-
+#endif
 /*
  * Locally Unique Identifier

trunk/src/NTDLL/exception.cpp

@@ -1 @@
-/* $Id: exception.cpp,v 1.1 1999-08-18 19:35:43 phaller Exp $ */
+/* $Id: exception.cpp,v 1.2 1999-11-30 20:20:31 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 #include "winerror.h"
 #include "winreg.h"
-
-#include <win/except.h>
 
 /*

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.12 1999-11-30 14:16:44 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.13 1999-11-30 20:19:52 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <ctype.h>
 #include <setjmp.h>
-#include <except.h>
 #include <debugtools.h>
 
@@ -49 +48 @@
 #include "crtinc.h"
 #include "ieee.h"
+#include <ntddk.h>
 
 DEFAULT_DEBUG_CHANNEL(crtdll)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.36 1999-11-30 19:40:26 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.37 1999-11-30 20:19:34 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 
 #include "misc.h"
-#include "except.h"
 #include <builtin.h>
 #include "heap.h"

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.17 1999-11-08 13:43:13 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.18 1999-11-30 20:19:34 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <windllbase.h>
 #include <winexebase.h>
-#include <except.h>
 
 ODINDEBUGCHANNEL(KERNEL32-THREAD)

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.7 1999-11-27 00:05:40 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.8 1999-11-30 20:19:34 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -14 +14 @@
 #include <thread.h>
 #include <wprocess.h>
-#include <except.h>
 #include "exceptutil.h"
 

trunk/tools/wrc/makefile.os2

@@ -2 +2 @@
 
 #DEFS      = -D__WINE__ -D__WIN32OS2__ -idirafter ../../include/win -idirafter ../../include
-DEFS      = -D__WINE__ -D__WIN32OS2__ -I../../include/win -I../../include
+DEFS      = -D__WINE__ -I../../include/win -I../../include
 
 PROGRAMS = wrc.exe