Changeset 19943

Timestamp:

Nov 12, 2002, 6:05:08 PM (22 years ago)

Author:

sandervl

Message:

updates

Location:

tags/trunk/include/win

Files:

• wine/obj_misc.h (modified) (1 diff)
• winerror.h (modified) (2 diffs)
• winternl.h (added)
• wtypes.h (modified) (1 diff)

tags/trunk/include/win/wine/obj_misc.h ¶

@@ -1 @@
-/* $Id: obj_misc.h,v 1.6 2002-11-12 17:04:37 sandervl Exp $ */
 /*
  * Defines miscellaneous COM interfaces and APIs defined in objidl.h.

tags/trunk/include/win/winerror.h ¶

@@ -1589 +1589 @@
 #define MK_E_NOPREFIX                             0x800401EE
 
-#define STG_E_INVALIDFUNCTION           0x80030001
-#define STG_E_FILENOTFOUND              0x80030002
-#define STG_E_PATHNOTFOUND              0x80030003
-#define STG_E_TOOMANYOPENFILES          0x80030004
-#define STG_E_ACCESSDENIED              0x80030005
-#define STG_E_INVALIDHANDLE             0x80030006
-#define STG_E_INSUFFICIENTMEMORY        0x80030008
-#define STG_E_INVALIDPOINTER            0x80030009
-#define STG_E_NOMOREFILES               0x80030012
-#define STG_E_DISKISWRITEPROTECTED      0x80030013
-#define STG_E_SEEKERROR                 0x80030019
-#define STG_E_WRITEFAULT                0x8003001D
-#define STG_E_READFAULT                 0x8003001E
-#define STG_E_SHAREVIOLATION            0x80030020
-#define STG_E_LOCKVIOLATION             0x80030021
-#define STG_E_FILEALREADYEXISTS         0x80030050
-#define STG_E_INVALIDPARAMETER          0x80030057
-#define STG_E_MEDIUMFULL                0x80030070
-#define STG_E_ABNORMALAPIEXIT           0x800300FA
-#define STG_E_INVALIDHEADER             0x800300FB
-#define STG_E_INVALIDNAME               0x800300FC
-#define STG_E_UNKNOWN                   0x800300FD
-#define STG_E_UNIMPLEMENTEDFUNCTION     0x800300FE
-#define STG_E_INVALIDFLAG               0x800300FF
-#define STG_E_INUSE                     0x80030100
-#define STG_E_NOTCURRENT                0x80030101
-#define STG_E_REVERTED                  0x80030102
-#define STG_E_CANTSAVE                  0x80030103
-#define STG_E_OLDFORMAT                 0x80030104
-#define STG_E_OLDDLL                    0x80030105
-#define STG_E_SHAREREQUIRED             0x80030106
-#define STG_E_NOTFILEBASEDSTORAGE       0x80030107
-#define STG_E_EXTANTMARSHALLINGS        0x80030108
-
 /* alten versionen
 #define E_NOTIMPL                       0x80000001
@@ -1733 +1699 @@
 #define RPC_E_UNEXPECTED                 0x8001FFFFL
 
+#define DISP_E_UNKNOWNINTERFACE                            0x80020001L
+#define DISP_E_MEMBERNOTFOUND                              0x80020003L
+#define DISP_E_PARAMNOTFOUND                               0x80020004L
+#define DISP_E_TYPEMISMATCH                                0x80020005L
+#define DISP_E_UNKNOWNNAME                                 0x80020006L
+#define DISP_E_NONAMEDARGS                                 0x80020007L
+#define DISP_E_BADVARTYPE                                  0x80020008L
+#define DISP_E_EXCEPTION                                   0x80020009L
+#define DISP_E_OVERFLOW                                    0x8002000AL
+#define DISP_E_BADINDEX                                    0x8002000BL
+#define DISP_E_UNKNOWNLCID                                 0x8002000CL
+#define DISP_E_ARRAYISLOCKED                               0x8002000DL
+#define DISP_E_BADPARAMCOUNT                               0x8002000EL
+#define DISP_E_PARAMNOTOPTIONAL                            0x8002000FL
+#define DISP_E_BADCALLEE                                   0x80020010L
+#define DISP_E_NOTACOLLECTION                              0x80020011L
+#define DISP_E_DIVBYZERO                                   0x80020012L
+
+#define TYPE_E_BUFFERTOOSMALL                              0x80028016L
+#define TYPE_E_FIELDNOTFOUND                               0x80028017L
+#define TYPE_E_INVDATAREAD                                 0x80028018L
+#define TYPE_E_UNSUPFORMAT                                 0x80028019L
+#define TYPE_E_REGISTRYACCESS                              0x8002801CL
+#define TYPE_E_LIBNOTREGISTERED                            0x8002801DL
+#define TYPE_E_UNDEFINEDTYPE                               0x80028027L
+#define TYPE_E_QUALIFIEDNAMEDISALLOWED                     0x80028028L
+#define TYPE_E_INVALIDSTATE                                0x80028029L
+#define TYPE_E_WRONGTYPEKIND                               0x8002802AL
+#define TYPE_E_ELEMENTNOTFOUND                             0x8002802BL
+#define TYPE_E_AMBIGUOUSNAME                               0x8002802CL
+#define TYPE_E_NAMECONFLICT                                0x8002802DL
+#define TYPE_E_UNKNOWNLCID                                 0x8002802EL
+#define TYPE_E_DLLFUNCTIONNOTFOUND                         0x8002802FL
+#define TYPE_E_BADMODULEKIND                               0x800288BDL
+#define TYPE_E_SIZETOOBIG                                  0x800288C5L
+#define TYPE_E_DUPLICATEID                                 0x800288C6L
+#define TYPE_E_INVALIDID                                   0x800288CFL
+#define TYPE_E_TYPEMISMATCH                                0x80028CA0L
+#define TYPE_E_OUTOFBOUNDS                                 0x80028CA1L
+#define TYPE_E_IOERROR                                     0x80028CA2L
+#define TYPE_E_CANTCREATETMPFILE                           0x80028CA3L
+#define TYPE_E_CANTLOADLIBRARY                             0x80029C4AL
+#define TYPE_E_INCONSISTENTPROPFUNCS                       0x80029C83L
+#define TYPE_E_CIRCULARTYPE                                0x80029C84L
+
+#define STG_S_CONVERTED                                    0x00030200L
+#define STG_S_BLOCK                                        0x00030201L
+#define STG_S_RETRYNOW                                     0x00030202L
+#define STG_S_MONITORING                                   0x00030203L
+#define STG_S_MULTIPLEOPENS                                0x00030204L
+#define STG_S_CONSOLIDATIONFAILED                          0x00030205L
+#define STG_S_CANNOTCONSOLIDATE                            0x00030206L
+
+#define STG_E_INVALIDFUNCTION                              0x80030001L
+#define STG_E_FILENOTFOUND                                 0x80030002L
+#define STG_E_PATHNOTFOUND                                 0x80030003L
+#define STG_E_TOOMANYOPENFILES                             0x80030004L
+#define STG_E_ACCESSDENIED                                 0x80030005L
+#define STG_E_INVALIDHANDLE                                0x80030006L
+#define STG_E_INSUFFICIENTMEMORY                           0x80030008L
+#define STG_E_INVALIDPOINTER                               0x80030009L
+#define STG_E_NOMOREFILES                                  0x80030012L
+#define STG_E_DISKISWRITEPROTECTED                         0x80030013L
+#define STG_E_SEEKERROR                                    0x80030019L
+#define STG_E_WRITEFAULT                                   0x8003001DL
+#define STG_E_READFAULT                                    0x8003001EL
+#define STG_E_SHAREVIOLATION                               0x80030020L
+#define STG_E_LOCKVIOLATION                                0x80030021L
+#define STG_E_FILEALREADYEXISTS                            0x80030050L
+#define STG_E_INVALIDPARAMETER                             0x80030057L
+#define STG_E_MEDIUMFULL                                   0x80030070L
+#define STG_E_ABNORMALAPIEXIT                              0x800300FAL
+#define STG_E_INVALIDHEADER                                0x800300FBL
+#define STG_E_INVALIDNAME                                  0x800300FCL
+#define STG_E_UNKNOWN                                      0x800300FDL
+#define STG_E_UNIMPLEMENTEDFUNCTION                        0x800300FEL
+#define STG_E_INVALIDFLAG                                  0x800300FFL
+#define STG_E_INUSE                                        0x80030100L
+#define STG_E_NOTCURRENT                                   0x80030101L
+#define STG_E_REVERTED                                     0x80030102L
+#define STG_E_CANTSAVE                                     0x80030103L
+#define STG_E_OLDFORMAT                                    0x80030104L
+#define STG_E_OLDDLL                                       0x80030105L
+#define STG_E_SHAREREQUIRED                                0x80030106L
+#define STG_E_NOTFILEBASEDSTORAGE                          0x80030107L
+#define STG_E_EXTANTMARSHALLINGS                           0x80030108L
+
+#define STG_E_STATUS_COPY_PROTECTION_FAILURE               0x80030305L
+#define STG_E_CSS_AUTHENTICATION_FAILURE                   0x80030306L
+#define STG_E_CSS_KEY_NOT_PRESENT                          0x80030307L
+#define STG_E_CSS_KEY_NOT_ESTABLISHED                      0x80030308L
+#define STG_E_CSS_SCRAMBLED_SECTOR                         0x80030309L
+#define STG_E_CSS_REGION_MISMATCH                          0x8003030AL
+#define STG_E_RESETS_EXHAUSTED                             0x8003030BL
+
 #endif  /* __WINE_WINERROR_H */

tags/trunk/include/win/wtypes.h ¶

@@ -136 +136 @@
 #define CLSCTX_SERVER           (CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
 
+typedef enum tagMSHLFLAGS
+{
+    MSHLFLAGS_NORMAL        = 0,
+    MSHLFLAGS_TABLESTRONG   = 1,
+    MSHLFLAGS_TABLEWEAK     = 2,
+    MSHLFLAGS_NOPING        = 4
+} MSHLFLAGS;
+
+typedef enum tagMSHCTX
+{
+    MSHCTX_LOCAL            = 0,
+    MSHCTX_NOSHAREDMEM      = 1,
+    MSHCTX_DIFFERENTMACHINE = 2,
+    MSHCTX_INPROC           = 3,
+    MSHCTX_CROSSCTX         = 4
+} MSHCTX;
+
 typedef unsigned short VARTYPE;