Changeset 1898 for trunk/include


Ignore:
Timestamp:
Nov 30, 1999, 9:20:31 PM (26 years ago)
Author:
sandervl
Message:

compilation fixes

Location:
trunk/include/win
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/win/windef.h

    r1890 r1898  
    1 /* $Id: windef.h,v 1.16 1999-11-30 19:38:23 sandervl Exp $ */
     1/* $Id: windef.h,v 1.17 1999-11-30 20:19:02 sandervl Exp $ */
    22
    33/*
     
    213213typedef WORD            CATCHBUF[9];
    214214typedef WORD           *LPCATCHBUF;
    215 typedef DWORD           ACCESS_MASK;
    216 typedef ACCESS_MASK     REGSAM;
     215typedef DWORD           REGSAM;
    217216typedef HANDLE          HHOOK;
    218217typedef HANDLE          HKEY;
  • trunk/include/win/wine/obj_control.h

    r805 r1898  
    1 /* $Id: obj_control.h,v 1.6 1999-09-02 20:56:30 phaller Exp $ */
     1/* $Id: obj_control.h,v 1.7 1999-11-30 20:19:03 sandervl Exp $ */
    22/*
    33 * Defines the COM interfaces and APIs related to structured data storage.
     
    4545        DWORD clSize;
    4646        DWORD rpcReserved;
    47         ULONGLONG_W ahData[1];
     47        ULONGLONG ahData[1];
    4848} wireVARIANT_BLOB;
    4949
  • trunk/include/win/winnt.h

    r1890 r1898  
    785785#define MAXIMUM_SUSPEND_COUNT 127
    786786
     787#define EXCEPTION_ACCESS_VIOLATION          STATUS_ACCESS_VIOLATION
     788#define EXCEPTION_DATATYPE_MISALIGNMENT     STATUS_DATATYPE_MISALIGNMENT
     789#define EXCEPTION_BREAKPOINT                STATUS_BREAKPOINT
     790#define EXCEPTION_SINGLE_STEP               STATUS_SINGLE_STEP
     791#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED     STATUS_ARRAY_BOUNDS_EXCEEDED
     792#define EXCEPTION_FLT_DENORMAL_OPERAND      STATUS_FLOAT_DENORMAL_OPERAND
     793#define EXCEPTION_FLT_DIVIDE_BY_ZERO        STATUS_FLOAT_DIVIDE_BY_ZERO
     794#define EXCEPTION_FLT_INEXACT_RESULT        STATUS_FLOAT_INEXACT_RESULT
     795#define EXCEPTION_FLT_INVALID_OPERATION     STATUS_FLOAT_INVALID_OPERATION
     796#define EXCEPTION_FLT_OVERFLOW              STATUS_FLOAT_OVERFLOW
     797#define EXCEPTION_FLT_STACK_CHECK           STATUS_FLOAT_STACK_CHECK
     798#define EXCEPTION_FLT_UNDERFLOW             STATUS_FLOAT_UNDERFLOW
     799#define EXCEPTION_INT_DIVIDE_BY_ZERO        STATUS_INTEGER_DIVIDE_BY_ZERO
     800#define EXCEPTION_INT_OVERFLOW              STATUS_INTEGER_OVERFLOW
     801#define EXCEPTION_PRIV_INSTRUCTION          STATUS_PRIVILEGED_INSTRUCTION
     802#define EXCEPTION_IN_PAGE_ERROR             STATUS_IN_PAGE_ERROR
     803#define EXCEPTION_ILLEGAL_INSTRUCTION       STATUS_ILLEGAL_INSTRUCTION
     804#define EXCEPTION_NONCONTINUABLE_EXCEPTION  STATUS_NONCONTINUABLE_EXCEPTION
     805#define EXCEPTION_STACK_OVERFLOW            STATUS_STACK_OVERFLOW
     806#define EXCEPTION_INVALID_DISPOSITION       STATUS_INVALID_DISPOSITION
     807#define EXCEPTION_GUARD_PAGE                STATUS_GUARD_PAGE_VIOLATION
     808#define EXCEPTION_INVALID_HANDLE            STATUS_INVALID_HANDLE
     809#define CONTROL_C_EXIT                      STATUS_CONTROL_C_EXIT
     810
     811/* Wine extension; Windows doesn't have a name for this code */
     812#define EXCEPTION_CRITICAL_SECTION_WAIT     0xc0000194
     813
    787814
    788815/*
     
    870897 */
    871898
    872 typedef LONG (CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
     899typedef LONG (* CALLBACK PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo);
    873900typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
    874901
     
    10061033
    10071034typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
    1008 typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;
     1035typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL, *LPSECURITY_DESCRIPTOR;
    10091036
    10101037/* The security descriptor structure */
     
    10561083 * LUID_AND_ATTRIBUTES
    10571084 */
    1058 
     1085#ifdef __WIN32OS2__
     1086typedef union _LARGE_INTEGER {
     1087        DWORD    LowPart;
     1088        LONG     HighPart;
     1089} LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER;
     1090
     1091typedef union _ULARGE_INTEGER {
     1092        DWORD    LowPart;
     1093        LONG     HighPart;
     1094} ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
     1095#else
    10591096typedef union _LARGE_INTEGER {
    10601097    struct {
     
    10721109    LONGLONG QuadPart;
    10731110} ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
    1074 
     1111#endif
    10751112/*
    10761113 * Locally Unique Identifier
Note: See TracChangeset for help on using the changeset viewer.