Commit 537773fb authored by Alexandre Julliard's avatar Alexandre Julliard

widl: Add some more attribute keywords.

parent d4e8f303
...@@ -304,15 +304,22 @@ static const struct keyword attr_keywords[] = ...@@ -304,15 +304,22 @@ static const struct keyword attr_keywords[] =
{"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE},
{"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE},
{"control", tCONTROL}, {"control", tCONTROL},
{"decode", tDECODE},
{"defaultbind", tDEFAULTBIND},
{"defaultcollelem", tDEFAULTCOLLELEM}, {"defaultcollelem", tDEFAULTCOLLELEM},
{"defaultvalue", tDEFAULTVALUE}, {"defaultvalue", tDEFAULTVALUE},
{"defaultvtable", tDEFAULTVTABLE}, {"defaultvtable", tDEFAULTVTABLE},
{"disable_consistency_check", tDISABLECONSISTENCYCHECK},
{"displaybind", tDISPLAYBIND}, {"displaybind", tDISPLAYBIND},
{"dllname", tDLLNAME}, {"dllname", tDLLNAME},
{"dual", tDUAL}, {"dual", tDUAL},
{"enable_allocate", tENABLEALLOCATE},
{"encode", tENCODE},
{"endpoint", tENDPOINT}, {"endpoint", tENDPOINT},
{"entry", tENTRY}, {"entry", tENTRY},
{"explicit_handle", tEXPLICITHANDLE}, {"explicit_handle", tEXPLICITHANDLE},
{"fault_status", tFAULTSTATUS},
{"force_allocate", tFORCEALLOCATE},
{"handle", tHANDLE}, {"handle", tHANDLE},
{"helpcontext", tHELPCONTEXT}, {"helpcontext", tHELPCONTEXT},
{"helpfile", tHELPFILE}, {"helpfile", tHELPFILE},
...@@ -322,6 +329,7 @@ static const struct keyword attr_keywords[] = ...@@ -322,6 +329,7 @@ static const struct keyword attr_keywords[] =
{"hidden", tHIDDEN}, {"hidden", tHIDDEN},
{"id", tID}, {"id", tID},
{"idempotent", tIDEMPOTENT}, {"idempotent", tIDEMPOTENT},
{"ignore", tIGNORE},
{"iid_is", tIIDIS}, {"iid_is", tIIDIS},
{"immediatebind", tIMMEDIATEBIND}, {"immediatebind", tIMMEDIATEBIND},
{"implicit_handle", tIMPLICITHANDLE}, {"implicit_handle", tIMPLICITHANDLE},
...@@ -330,24 +338,34 @@ static const struct keyword attr_keywords[] = ...@@ -330,24 +338,34 @@ static const struct keyword attr_keywords[] =
{"input_sync", tINPUTSYNC}, {"input_sync", tINPUTSYNC},
{"lcid", tLCID}, {"lcid", tLCID},
{"length_is", tLENGTHIS}, {"length_is", tLENGTHIS},
{"licensed", tLICENSED},
{"local", tLOCAL}, {"local", tLOCAL},
{"maybe", tMAYBE},
{"message", tMESSAGE},
{"nocode", tNOCODE},
{"nonbrowsable", tNONBROWSABLE}, {"nonbrowsable", tNONBROWSABLE},
{"noncreatable", tNONCREATABLE}, {"noncreatable", tNONCREATABLE},
{"nonextensible", tNONEXTENSIBLE}, {"nonextensible", tNONEXTENSIBLE},
{"notify", tNOTIFY},
{"notify_flag", tNOTIFYFLAG},
{"object", tOBJECT}, {"object", tOBJECT},
{"odl", tODL}, {"odl", tODL},
{"oleautomation", tOLEAUTOMATION}, {"oleautomation", tOLEAUTOMATION},
{"optimize", tOPTIMIZE},
{"optional", tOPTIONAL}, {"optional", tOPTIONAL},
{"out", tOUT}, {"out", tOUT},
{"partial_ignore", tPARTIALIGNORE},
{"pointer_default", tPOINTERDEFAULT}, {"pointer_default", tPOINTERDEFAULT},
{"propget", tPROPGET}, {"propget", tPROPGET},
{"propput", tPROPPUT}, {"propput", tPROPPUT},
{"propputref", tPROPPUTREF}, {"propputref", tPROPPUTREF},
{"proxy", tPROXY},
{"ptr", tPTR}, {"ptr", tPTR},
{"public", tPUBLIC}, {"public", tPUBLIC},
{"range", tRANGE}, {"range", tRANGE},
{"readonly", tREADONLY}, {"readonly", tREADONLY},
{"ref", tREF}, {"ref", tREF},
{"represent_as", tREPRESENTAS},
{"requestedit", tREQUESTEDIT}, {"requestedit", tREQUESTEDIT},
{"restricted", tRESTRICTED}, {"restricted", tRESTRICTED},
{"retval", tRETVAL}, {"retval", tRETVAL},
...@@ -358,7 +376,10 @@ static const struct keyword attr_keywords[] = ...@@ -358,7 +376,10 @@ static const struct keyword attr_keywords[] =
{"switch_is", tSWITCHIS}, {"switch_is", tSWITCHIS},
{"switch_type", tSWITCHTYPE}, {"switch_type", tSWITCHTYPE},
{"transmit_as", tTRANSMITAS}, {"transmit_as", tTRANSMITAS},
{"uidefault", tUIDEFAULT},
{"unique", tUNIQUE}, {"unique", tUNIQUE},
{"user_marshal", tUSERMARSHAL},
{"usesgetlasterror", tUSESGETLASTERROR},
{"uuid", tUUID}, {"uuid", tUUID},
{"v1_enum", tV1ENUM}, {"v1_enum", tV1ENUM},
{"vararg", tVARARG}, {"vararg", tVARARG},
...@@ -366,6 +387,13 @@ static const struct keyword attr_keywords[] = ...@@ -366,6 +387,13 @@ static const struct keyword attr_keywords[] =
{"wire_marshal", tWIREMARSHAL}, {"wire_marshal", tWIREMARSHAL},
}; };
/* attributes TODO:
custom
first_is
last_is
max_is
min_is
*/
#define KWP(p) ((const struct keyword *)(p)) #define KWP(p) ((const struct keyword *)(p))
......
...@@ -74,20 +74,29 @@ enum attr_type ...@@ -74,20 +74,29 @@ enum attr_type
ATTR_CALLAS, ATTR_CALLAS,
ATTR_CALLCONV, /* calling convention pseudo-attribute */ ATTR_CALLCONV, /* calling convention pseudo-attribute */
ATTR_CASE, ATTR_CASE,
ATTR_CODE,
ATTR_COMMSTATUS,
ATTR_CONST, /* const pseudo-attribute */ ATTR_CONST, /* const pseudo-attribute */
ATTR_CONTEXTHANDLE, ATTR_CONTEXTHANDLE,
ATTR_CONTROL, ATTR_CONTROL,
ATTR_DECODE,
ATTR_DEFAULT, ATTR_DEFAULT,
ATTR_DEFAULTBIND,
ATTR_DEFAULTCOLLELEM, ATTR_DEFAULTCOLLELEM,
ATTR_DEFAULTVALUE, ATTR_DEFAULTVALUE,
ATTR_DEFAULTVTABLE, ATTR_DEFAULTVTABLE,
ATTR_DISABLECONSISTENCYCHECK,
ATTR_DISPINTERFACE, ATTR_DISPINTERFACE,
ATTR_DISPLAYBIND, ATTR_DISPLAYBIND,
ATTR_DLLNAME, ATTR_DLLNAME,
ATTR_DUAL, ATTR_DUAL,
ATTR_ENABLEALLOCATE,
ATTR_ENCODE,
ATTR_ENDPOINT, ATTR_ENDPOINT,
ATTR_ENTRY, ATTR_ENTRY,
ATTR_EXPLICIT_HANDLE, ATTR_EXPLICIT_HANDLE,
ATTR_FAULTSTATUS,
ATTR_FORCEALLOCATE,
ATTR_HANDLE, ATTR_HANDLE,
ATTR_HELPCONTEXT, ATTR_HELPCONTEXT,
ATTR_HELPFILE, ATTR_HELPFILE,
...@@ -97,6 +106,7 @@ enum attr_type ...@@ -97,6 +106,7 @@ enum attr_type
ATTR_HIDDEN, ATTR_HIDDEN,
ATTR_ID, ATTR_ID,
ATTR_IDEMPOTENT, ATTR_IDEMPOTENT,
ATTR_IGNORE,
ATTR_IIDIS, ATTR_IIDIS,
ATTR_IMMEDIATEBIND, ATTR_IMMEDIATEBIND,
ATTR_IMPLICIT_HANDLE, ATTR_IMPLICIT_HANDLE,
...@@ -105,24 +115,34 @@ enum attr_type ...@@ -105,24 +115,34 @@ enum attr_type
ATTR_INPUTSYNC, ATTR_INPUTSYNC,
ATTR_LENGTHIS, ATTR_LENGTHIS,
ATTR_LIBLCID, ATTR_LIBLCID,
ATTR_LICENSED,
ATTR_LOCAL, ATTR_LOCAL,
ATTR_MAYBE,
ATTR_MESSAGE,
ATTR_NOCODE,
ATTR_NONBROWSABLE, ATTR_NONBROWSABLE,
ATTR_NONCREATABLE, ATTR_NONCREATABLE,
ATTR_NONEXTENSIBLE, ATTR_NONEXTENSIBLE,
ATTR_NOTIFY,
ATTR_NOTIFYFLAG,
ATTR_OBJECT, ATTR_OBJECT,
ATTR_ODL, ATTR_ODL,
ATTR_OLEAUTOMATION, ATTR_OLEAUTOMATION,
ATTR_OPTIMIZE,
ATTR_OPTIONAL, ATTR_OPTIONAL,
ATTR_OUT, ATTR_OUT,
ATTR_PARAMLCID, ATTR_PARAMLCID,
ATTR_PARTIALIGNORE,
ATTR_POINTERDEFAULT, ATTR_POINTERDEFAULT,
ATTR_POINTERTYPE, ATTR_POINTERTYPE,
ATTR_PROPGET, ATTR_PROPGET,
ATTR_PROPPUT, ATTR_PROPPUT,
ATTR_PROPPUTREF, ATTR_PROPPUTREF,
ATTR_PROXY,
ATTR_PUBLIC, ATTR_PUBLIC,
ATTR_RANGE, ATTR_RANGE,
ATTR_READONLY, ATTR_READONLY,
ATTR_REPRESENTAS,
ATTR_REQUESTEDIT, ATTR_REQUESTEDIT,
ATTR_RESTRICTED, ATTR_RESTRICTED,
ATTR_RETVAL, ATTR_RETVAL,
...@@ -133,6 +153,9 @@ enum attr_type ...@@ -133,6 +153,9 @@ enum attr_type
ATTR_SWITCHIS, ATTR_SWITCHIS,
ATTR_SWITCHTYPE, ATTR_SWITCHTYPE,
ATTR_TRANSMITAS, ATTR_TRANSMITAS,
ATTR_UIDEFAULT,
ATTR_USERMARSHAL,
ATTR_USESGETLASTERROR,
ATTR_UUID, ATTR_UUID,
ATTR_V1ENUM, ATTR_V1ENUM,
ATTR_VARARG, ATTR_VARARG,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment